Changeset 156 for oup/current/DataAccess

Timestamp:

Apr 2, 2007, 12:49:17 AM (18 years ago)

Author:

alloc

Message:

 

File:

• oup/current/DataAccess/Access_OUP_ADB.pas (modified) (4 diffs)

oup/current/DataAccess/Access_OUP_ADB.pas

@@ -47 +47 @@
 
 uses
-  SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks;
+  SysUtils, Data, Functions, ABSDecUtil, DB, DatLinks, StrUtils;
 
 
@@ -214 +214 @@
 
 
+  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;
+  end;
 
 function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;
@@ -254 +287 @@
 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
@@ -277 +312 @@
     end;
   end;
+  if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
+    list.CustomSort(CompareItems);
   if not Assigned(Result) then
     Result := TStringList.Create;