--- oup/current/DataAccess/Access_OUP_ADB.pas 2007/04/01 22:49:17 156 +++ oup/current/DataAccess/Access_OUP_ADB.pas 2007/06/20 10:57:51 229 @@ -90,7 +90,7 @@ begin end; if FQuery.FieldByName('name').AsString = 'lvl' then FLevelNumber := StrToInt(FQuery.FieldByName('value').AsString); - if FQuery.FieldByName('name').AsString = 'DataOS' then + if FQuery.FieldByName('name').AsString = 'os' then begin if FQuery.FieldByName('value').AsString = 'WIN' then FDataOS := DOS_WIN @@ -112,6 +112,8 @@ begin FChangeRights := [CR_EditDat, CR_EditRaw, CR_ResizeDat, CR_ResizeRaw]; UpdateListCache; + + inherited; end; @@ -215,36 +217,11 @@ end; function CompareItems(List: TStringList; I1, I2: Integer): Integer; var - fin: Boolean; - pos: Integer; s1, s2: String; begin - fin := False; s1 := MidStr(List[I1], 1, PosEx(';', List[I1], 6) - 1); s2 := MidStr(List[I2], 1, PosEx(';', List[I2], 6) - 1); - pos := 1; - Result := 0; - repeat - if Ord(s1[pos]) < Ord(s2[pos]) then - begin - Result := -1; - fin := True; - end - else if Ord(s1[pos]) > Ord(s2[pos]) then - begin - Result := 1; - fin := True; - end; - Inc(pos); - until fin or (pos > Length(s1)) or (pos > Length(s2)); - - if not fin then - begin - if pos > Length(s1) then - Result := -1 - else - Result := 1; - end; + Result := CompareStr(s1, s2); end; function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;