--- oup/current/Helper/LevelDB.pas	2007/03/28 01:12:22	129
+++ oup/current/Helper/LevelDB.pas	2007/03/28 17:53:54	134
@@ -65,11 +65,8 @@ var
   Stream_Body, Stream_Names:          TMemoryStream;
   Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
 
-//  Data, rawdata: Tdata;
   BeginTime, FileTime: Double;
   Step:     Integer;
-//  rawlist:  TRawDataList;
-//  datlinks: TDatLinks;
   OniImage:   TOniImage;
   LevelID:    Integer;
   TimeFormat: TFormatSettings;
@@ -90,6 +87,12 @@ var
   RawLinks:   TRawDataList;
 
   DatFileStream, RawFileStream: TMemoryStream;
+
+// ###########################
+  datsum, linksum, rawsum: Int64;
+  freq: Int64;
+  tempticks1, tempticks2: Int64;
+// ###########################
 const
   Steps: Byte = 3;
 
@@ -151,15 +154,20 @@ begin
       begin
         ShowMessage('Couldn''t delete file. Aborting');
         Exit;
-      end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
-      begin
-        ShowMessage('Couldn''t delete file. Aborting');
-        Exit;
-      end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
-      begin
-        ShowMessage('Couldn''t delete file. Aborting');
-        Exit;
       end;
+      if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
+        if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
+        begin
+          ShowMessage('Couldn''t delete file. Aborting');
+          Exit;
+        end;
+      if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
+        if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
+          if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
+          begin
+            ShowMessage('Couldn''t delete file. Aborting');
+            Exit;
+          end;
     end else begin
       ShowMessage('Aborting');
       Exit;
@@ -275,6 +283,11 @@ begin
   lbl_estimation.Caption := 'Estimated finishing time: unknown';
   Application.ProcessMessages;
 
+  QueryPerformanceFrequency(freq);
+  datsum := 0;
+  linksum := 0;
+  rawsum := 0;
+
   FileTime := Time;
   for FileID := 0 to DatHeader.Files - 1 do
   begin
@@ -283,12 +296,18 @@ begin
       FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
     if FileInfo.Size > 0 then
     begin
+      QueryPerformanceCounter(tempticks1);
+
       FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
       DatFileStream := TMemoryStream.Create;
       Connection.LoadDatFile(FileID, TStream(DatFileStream));
-      DatFileStream.Seek(4, soFromBeginning);
+      DatFileStream.Seek(0, soFromBeginning);
+      DatFileStream.Write(FileID, 4);
       DatFileStream.Write(LevelID, 4);
 
+      QueryPerformanceCounter(tempticks2);
+      datsum := datsum + (tempticks2 - tempticks1);
+
       DatLinks := Connection.GetDatLinks(FileID);
       if Length(DatLinks) > 0 then
       begin
@@ -303,6 +322,9 @@ begin
         end;
       end;
 
+      QueryPerformanceCounter(tempticks1);
+      linksum := linksum + (tempticks1 - tempticks2);
+
       RawLinks := Connection.GetRawList(FileID);
       if Length(RawLinks) > 0 then
       begin
@@ -329,28 +351,36 @@ begin
       end;
       DatFileStream.Seek(0, soFromBeginning);
       Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
+
+      QueryPerformanceCounter(tempticks2);
+      rawsum := rawsum + (tempticks2 - tempticks1);
     end
     else
-      FilesHeader[i].DataAddr := 0;
+      FilesHeader[FileID].DataAddr := 0;
     if Length(fileinfo.Name) > 0 then
     begin
-      FilesHeader[i].NameAddr := Stream_Names.Size;
+      FilesHeader[FileID].NameAddr := Stream_Names.Size;
       temps := fileinfo.Extension + fileinfo.Name + Chr(0);
       Stream_Names.Write(temps[1], Length(temps));
     end
     else
-      FilesHeader[i].NameAddr := 0;
-    FilesHeader[i].FileSize := fileinfo.Size;
-    FilesHeader[i].FileType := fileinfo.FileType;
+      FilesHeader[FileID].NameAddr := 0;
+    FilesHeader[FileID].FileSize := fileinfo.Size;
+    FilesHeader[FileID].FileType := fileinfo.FileType;
 
-    if ((i mod 10) = 0) and (i >= 100) then
+    if ((FileID mod 10) = 0) and (FileID >= 100) then
       lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
-        (Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
-    progress.Position := i + 1;
-    lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
+        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
+    progress.Position := FileID + 1;
+    lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
     Application.ProcessMessages;
   end;
 
+  ShowMessage('AvgDats: ' + FloatToStr((datsum / progress.Max) / freq) + #13#10 +
+      'AvgLinks: ' + FloatToStr((linksum / progress.Max) / freq) + #13#10 +
+      'AvgRaws: ' + FloatToStr((rawsum / progress.Max) / freq)
+   );
+
   Stream_Dat.Write(DatHeader, SizeOf(DatHeader));
   for i := 0 to High(FilesHeader) do
     Stream_Dat.Write(FilesHeader[i], SizeOf(FilesHeader[i]));
@@ -362,6 +392,7 @@ begin
   DatHeader.DataSize  := Stream_Body.Size;
   DatHeader.NamesSize := Stream_Names.Size;
   DatHeader.DataAddr  := Stream_Dat.Size;
+
   Stream_Body.Seek(0, soFromBeginning);
   Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
   DatHeader.NamesAddr := Stream_Dat.Size;
@@ -417,6 +448,8 @@ begin
 
 
 procedure TForm_LevelDB.CreateDatabase(Source, target: String);
+var
+  DataBase:  TABSDatabase;
 {
 var
   DataBase:    TABSDatabase;
@@ -478,6 +511,9 @@ begin
   absolutebegintime := Time;
 
   DataBase := TABSDatabase.Create(Self);
+}
+  DataBase.MaxConnections := 1;
+{
   DataBase.DatabaseName := 'OLDB';
   DataBase.DatabaseFileName := target;
   DataBase.CreateDatabase;