--- oup/current/DataAccess/Access_OniArchive.pas	2007/02/21 03:12:33	109
+++ oup/current/DataAccess/Access_OniArchive.pas	2007/02/22 00:37:39	112
@@ -59,29 +59,6 @@ uses
 
 
 constructor TAccess_OniArchive.Create(DatFilename: String; ConnectionID: Integer; var Msg: TStatusMessages);
-type
-  THeader = packed record
-    Ident:      array[0..$13] of Byte;
-    Files:      Integer;
-    NamedFiles: Integer;
-    Extensions: Integer;
-    DataAddr:   Integer;
-    DataSize:   Integer;
-    NamesAddr:  Integer;
-    NamesSize:  Integer;
-    Ident2:     array[0..$F] of Byte;
-  end;
-  TFilesMap = array of packed record
-    Extension: array[0..$3] of Char;
-    DataAddr:  Integer;
-    NameAddr:  Integer;
-    FileSize:  Integer;
-    FileType:  LongWord;
-  end;
-  TNamedFilesMap = array of packed record
-    FileNumber: Integer;
-    blubb:      Integer;
-  end;
 const
   header_ident1_pc: array[0..$13] of Byte =
     ($1F, $27, $DC, $33, $DF, $BC, $03, $00, $31, $33, $52, $56, $40, $00,
@@ -249,6 +226,12 @@ var
       name := fields.Strings[2];
       extension := fields.Strings[0];
     end;
+    if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
+    begin
+      id := fields.Strings[2];
+      name := fields.Strings[1];
+      extension := fields.Strings[0];
+    end;
   end;
 
 begin
@@ -262,10 +245,7 @@ begin
     begin
       if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
       begin
-        if AppSettings.FilenumbersAsHex then
-          id := IntToHex(Fdat_files[i].ID, 4)
-        else
-          id := FormatNumber(Fdat_files[i].ID, 5, '0');
+        id := FormatNumber(Fdat_files[i].ID, 5, '0');
         name := Fdat_files[i].Name;
         extension := Fdat_files[i].Extension;
 
@@ -273,6 +253,7 @@ begin
           ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
           ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
           ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
+          ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
         end;
       end;
     end;
@@ -281,7 +262,7 @@ begin
   if list.Count > 0 then
   begin
     fields := TStringList.Create;
-    if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc] then
+    if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
       for i := 0 to list.Count - 1 do
       begin
         getfields;