--- oup/current/DataAccess/Access_OUP_ADB.pas 2007/04/01 21:14:29 155 +++ oup/current/DataAccess/Access_OUP_ADB.pas 2007/04/02 00:29:55 159 @@ -46,7 +46,7 @@ type implementation uses - SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks; + SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks, StrUtils; (* @@ -213,6 +213,14 @@ end; + function CompareItems(List: TStringList; I1, I2: Integer): Integer; + var + s1, s2: String; + begin + s1 := MidStr(List[I1], 1, PosEx(';', List[I1], 6) - 1); + s2 := MidStr(List[I2], 1, PosEx(';', List[I2], 6) - 1); + Result := CompareStr(s1, s2); + end; function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String; NoEmptyFiles: Boolean; SortType: TSortType): TStrings; @@ -253,8 +261,10 @@ var begin list := TStringList.Create; - list.CaseSensitive := True; - list.Sorted := True; + if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then + list.Sorted := False + else + list.Sorted := True; for i := 0 to GetFileCount - 1 do begin if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and @@ -276,6 +286,8 @@ begin end; end; end; + if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then + list.CustomSort(CompareItems); if not Assigned(Result) then Result := TStringList.Create; if list.Count > 0 then