--- oup/current/Helper/LevelDB.pas	2007/03/23 17:14:40	127
+++ oup/current/Helper/LevelDB.pas	2007/03/28 01:41:10	132
@@ -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,17 @@ 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.Write(LevelID, 4);
 
+      QueryPerformanceCounter(tempticks2);
+      datsum := datsum + (tempticks2 - tempticks1);
+
       DatLinks := Connection.GetDatLinks(FileID);
       if Length(DatLinks) > 0 then
       begin
@@ -303,6 +321,9 @@ begin
         end;
       end;
 
+      QueryPerformanceCounter(tempticks1);
+      linksum := linksum + (tempticks1 - tempticks2);
+
       RawLinks := Connection.GetRawList(FileID);
       if Length(RawLinks) > 0 then
       begin
@@ -323,17 +344,15 @@ begin
             end;
           end else
             RawLinks[i].RawAddr := 0;
+          DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
+          DatFileStream.Write(RawLinks[i].RawAddr, 4);
         end;
       end;
+      DatFileStream.Seek(0, soFromBeginning);
+      Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
 
-{
-            Data[rawlist[j].src_offset + 0] := (rawlist[j].raw_addr) and $FF;
-            Data[rawlist[j].src_offset + 1] := (rawlist[j].raw_addr shr 8) and $FF;
-            Data[rawlist[j].src_offset + 2] := (rawlist[j].raw_addr shr 16) and $FF;
-            Data[rawlist[j].src_offset + 3] := (rawlist[j].raw_addr shr 24) and $FF;
-}
-      Stream_Body.Write(Data[0], Length(Data));
-      //
+      QueryPerformanceCounter(tempticks2);
+      rawsum := rawsum + (tempticks2 - tempticks1);
     end
     else
       FilesHeader[i].DataAddr := 0;
@@ -348,14 +367,19 @@ begin
     FilesHeader[i].FileSize := fileinfo.Size;
     FilesHeader[i].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]));
@@ -380,7 +404,8 @@ begin
   Stream_Body.Free;
   Stream_Names.Free;
   Stream_Raw.Free;
-  if OniDataConnection.OSisMac then
+
+  if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
     Stream_Sep.Free;
 
   progress.Position      := progress.Max;
@@ -396,7 +421,7 @@ begin
 
   converting := False;
 
-  CloseDataConnection(DataConnections[conIndex]);
+//  CloseDataConnection(DataConnections[conIndex]);
 end;
 
 
@@ -406,7 +431,7 @@ procedure TForm_LevelDB.HandleFile;
 var
   i: Byte;
 begin
-  for i := 1 to Length(ConvertHandlers) do
+{  for i := 1 to Length(ConvertHandlers) do
     if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
       if ConvertHandlers[i].needed then
       begin
@@ -415,12 +440,13 @@ begin
       end
       else
         Break;
-end;
+}end;
 
 
 
 
 procedure TForm_LevelDB.CreateDatabase(Source, target: String);
+{
 var
   DataBase:    TABSDatabase;
   Query:       TABSQuery;
@@ -452,9 +478,10 @@ const
     else
       group_progress.Caption := 'Creating DB (FINISHED)';
   end;
+}
 
 begin
-  if CreateDataConnection(Source, ODB_Dat) = nil then
+{  if CreateDataConnection(Source, ODB_Dat) = nil then
   begin
     ShowMessage('Could not connect to .dat-file');
     Exit;
@@ -657,14 +684,15 @@ begin
   database.Free;
 
   CloseDataConnection(DataConnections[conIndex]);
+}
 end;
 
 
 
 
-procedure TForm_LevelDB.stop_convert;
+procedure TForm_LevelDB.StopConvert;
 begin
-  btn_abortok.Caption := '&Close';
+{  btn_abortok.Caption := '&Close';
   btn_abortok.Default := True;
   converting := False;
   lbl_estimation.Caption := 'ABORTED';
@@ -675,7 +703,7 @@ begin
   begin
     DeleteFile(loaded_filename);
   end;
-end;
+}end;
 
 
 
@@ -698,7 +726,7 @@ end;
 
 
 
-
+{
 procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
 var
   link: LongWord;
@@ -1730,10 +1758,10 @@ begin
   begin
   end;
 end;
+}
 
 
-
-
+{
 procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
 begin
   SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
@@ -1741,9 +1769,9 @@ begin
   ConvertHandlers[High(ConvertHandlers)].needed  := needed;
   ConvertHandlers[High(ConvertHandlers)].handler := handler;
 end;
-
+}
 begin
-  InsertHandler('ABNA', False, nil);
+{  InsertHandler('ABNA', False, nil);
   //  InsertHandler('AGDB',True,AGDB);
   InsertHandler('AGDB', False, nil);
   InsertHandler('AGQC', False, nil);
@@ -1841,4 +1869,4 @@ begin
   InsertHandler('WMM_', False, nil);
   InsertHandler('WMMB', True, WMMB);
   InsertHandler('WPGE', True, WPGE);
-end.
+}end.