Index: oup/current/DataAccess/Access_OUP_ADB.pas
===================================================================
--- oup/current/DataAccess/Access_OUP_ADB.pas	(revision 135)
+++ oup/current/DataAccess/Access_OUP_ADB.pas	(revision 136)
@@ -271,5 +271,5 @@
           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);
+          ST_ExtNameAsc, ST_ExtNameDesc: list.Add(extension + ';' + name + ';' + id);
         end;
       end;
Index: oup/current/Helper/LevelDB.pas
===================================================================
--- oup/current/Helper/LevelDB.pas	(revision 135)
+++ oup/current/Helper/LevelDB.pas	(revision 136)
@@ -514,4 +514,6 @@
 }
   DataBase.MaxConnections := 1;
+  DataBase.PageSize := 8112;
+  DataBase.PageCountInExtent := 8;
 {
   DataBase.DatabaseName := 'OLDB';
@@ -528,20 +530,28 @@
   Query.DatabaseName := 'OLDB';
   Query.SQL.Text :=
-    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), value STRING(128) );';
+    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), ' +
+    'value STRING(128) );';
   Query.ExecSQL;
   Query.SQL.Text :=
-    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, target_id INTEGER );';
+    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
+    'src_link_offset INTEGER, target_id INTEGER,  INDEX idsrcid src_id, ' +
+    'INDEX iddestid target_id);';
   Query.ExecSQL;
   Query.SQL.Text :=
-    'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, sep BOOLEAN, size INTEGER, data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
+    'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
+    'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
+    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib, ' +
+    'INDEX idsrcid src_id);';
   //    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
   Query.ExecSQL;
   Query.SQL.Text :=
-    'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
+    'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
+    'name STRING(128), contenttype INTEGER, size INTEGER, ' +
+    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
   //    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
   Query.ExecSQL;
-  Query.SQL.Text :=
-    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
-  Query.ExecSQL;
+//  Query.SQL.Text :=
+//    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
+//  Query.ExecSQL;
 
   Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("dbversion","' +
@@ -552,6 +562,6 @@
     Data[i] := OniDataConnection.LevelInfo.Ident[i];
   temps := CreateHexString(Data, True);
-  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("ident","' + temps + '");';
-  Query.ExecSQL;
+//  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("ident","' + temps + '");';
+//  Query.ExecSQL;
   Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("lvl","' +
     IntToStr(OniDataConnection.LevelInfo.LevelNumber) + '");';