ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/oup/current/Helper/LevelDB.pas
(Generate patch)

Comparing oup/current/Helper/LevelDB.pas (file contents):
Revision 130 by alloc, Wed Mar 28 01:17:24 2007 UTC vs.
Revision 142 by alloc, Fri Mar 30 02:08:49 2007 UTC

# Line 12 | Line 12 | type
12      btn_abortok:  TButton;
13      lbl_estimation: TLabel;
14      procedure btn_abortokClick(Sender: TObject);
15  private
16    procedure HandleFile(Ext: String; FileID: Integer);
17    procedure StopConvert;
15    public
16      procedure CreateDatabase(Source, Target: String);
17      procedure CreateLevel(Source, Target: String);
# Line 27 | Line 24 | var
24   implementation
25   {$R *.dfm}
26   uses ABSMain, ABSDecUtil, Main,
27 <    ConnectionManager, TypeDefs, DataAccess, OniImgClass, Data;
31 <
32 < type
33 <  THandler = procedure(FileID: Integer);
34 <  TConvertHandler = record
35 <    Ext:     String[4];
36 <    Handler: THandler;
37 <  end;
27 >    ConnectionManager, TypeDefs, DataAccess, OniImgClass, Data, RawList;
28  
29   var
40  ConvertHandlers: array of TConvertHandler;
41 //  loaded_filename: String;
30    Converting:  Boolean = False;
31    Abort:       Boolean = False;
32  
# Line 65 | Line 53 | var
53    Stream_Body, Stream_Names:          TMemoryStream;
54    Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
55  
68 //  Data, rawdata: Tdata;
56    BeginTime, FileTime: Double;
57    Step:     Integer;
71 //  rawlist:  TRawDataList;
72 //  datlinks: TDatLinks;
73  OniImage:   TOniImage;
58    LevelID:    Integer;
59    TimeFormat: TFormatSettings;
60  
# Line 104 | Line 88 | const
88        group_progress.Caption := 'Creating Dat (FINISHED)';
89    end;
90  
91 +  procedure StopConvert;
92 +  begin
93 +    btn_abortok.Caption := '&Close';
94 +    btn_abortok.Default := True;
95 +    converting := False;
96 +    lbl_estimation.Caption := 'ABORTED';
97 +    group_progress.Caption := 'Creating Level (ABORTED)';
98 +
99 +    Stream_Body.Free;
100 +    Stream_Names.Free;
101 +    DatFileStream.Free;
102 +    RawFileStream.Free;
103 +    
104 +    Stream_Dat.Free;
105 +    Stream_Raw.Free;
106 +    if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
107 +      Stream_Sep.Free;
108 +    
109 +    if MessageBox(Self.Handle, PChar('Delete the unfinished level-files?'),
110 +      PChar('Delete files?'), MB_YESNO) = idYes then
111 +    begin
112 +      DeleteFile(target);
113 +      DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw'));
114 +      if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
115 +        DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep'));
116 +    end;
117 +  end;
118 +
119   begin
120  
121    //
# Line 151 | Line 163 | begin
163        begin
164          ShowMessage('Couldn''t delete file. Aborting');
165          Exit;
166 <      end else if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
167 <      begin
168 <        ShowMessage('Couldn''t delete file. Aborting');
157 <        Exit;
158 <      end else if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
159 <      begin
160 <        if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
166 >      end;
167 >      if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
168 >        if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
169          begin
170            ShowMessage('Couldn''t delete file. Aborting');
171            Exit;
172          end;
173 <      end;
173 >      if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
174 >        if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
175 >          if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
176 >          begin
177 >            ShowMessage('Couldn''t delete file. Aborting');
178 >            Exit;
179 >          end;
180      end else begin
181        ShowMessage('Aborting');
182        Exit;
# Line 171 | Line 185 | begin
185  
186    LevelID  := Connection.LevelNumber;
187    LevelID  := (LevelID * 2) * 256 * 256 * 256 + $01;
174  OniImage := TOniImage.Create;
188  
189    Self.Visible := True;
190    Form_Main.Visible := False;
# Line 289 | Line 302 | begin
302        FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
303        DatFileStream := TMemoryStream.Create;
304        Connection.LoadDatFile(FileID, TStream(DatFileStream));
305 <      DatFileStream.Seek(4, soFromBeginning);
305 >      DatFileStream.Seek(0, soFromBeginning);
306 >      tempi := FileID * 256 + 1;
307 >      DatFileStream.Write(tempi, 4);
308        DatFileStream.Write(LevelID, 4);
309  
310        DatLinks := Connection.GetDatLinks(FileID);
# Line 334 | Line 349 | begin
349        Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
350      end
351      else
352 <      FilesHeader[i].DataAddr := 0;
352 >      FilesHeader[FileID].DataAddr := 0;
353      if Length(fileinfo.Name) > 0 then
354      begin
355 <      FilesHeader[i].NameAddr := Stream_Names.Size;
355 >      FilesHeader[FileID].NameAddr := Stream_Names.Size;
356        temps := fileinfo.Extension + fileinfo.Name + Chr(0);
357        Stream_Names.Write(temps[1], Length(temps));
358      end
359      else
360 <      FilesHeader[i].NameAddr := 0;
361 <    FilesHeader[i].FileSize := fileinfo.Size;
362 <    FilesHeader[i].FileType := fileinfo.FileType;
360 >      FilesHeader[FileID].NameAddr := 0;
361 >    FilesHeader[FileID].FileSize := fileinfo.Size;
362 >    FilesHeader[FileID].FileType := fileinfo.FileType;
363  
364      if ((FileID mod 10) = 0) and (FileID >= 100) then
365        lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
# Line 365 | Line 380 | begin
380    DatHeader.DataSize  := Stream_Body.Size;
381    DatHeader.NamesSize := Stream_Names.Size;
382    DatHeader.DataAddr  := Stream_Dat.Size;
383 +
384    Stream_Body.Seek(0, soFromBeginning);
385    Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
386    DatHeader.NamesAddr := Stream_Dat.Size;
# Line 391 | Line 407 | begin
407    btn_abortok.Caption := '&OK';
408    btn_abortok.Default := True;
409  
394  OniImage.Free;
395
410    converting := False;
411  
412   //  CloseDataConnection(DataConnections[conIndex]);
# Line 401 | Line 415 | end;
415  
416  
417  
404 procedure TForm_LevelDB.HandleFile;
405 var
406  i: Byte;
407 begin
408 {  for i := 1 to Length(ConvertHandlers) do
409    if UpperCase(ConvertHandlers[i].Ext) = UpperCase(ext) then
410      if ConvertHandlers[i].needed then
411      begin
412        ConvertHandlers[i].Handler(fileid, dir_dat2db);
413        Break;
414      end
415      else
416        Break;
417 }end;
418
419
420
421
418   procedure TForm_LevelDB.CreateDatabase(Source, target: String);
423 {
419   var
420 <  DataBase:    TABSDatabase;
421 <  Query:       TABSQuery;
422 <  MimeCoder:   TStringFormat_MIME64;
428 <
429 <  i, j:     LongWord;
430 <  temps, temps2: String;
431 <  Data:     Tdata;
432 <  absolutebegintime, begintime: Double;
433 <  step:     Byte;
434 <  rawlist:  TRawList;
435 <  extlist:  TExtensionsMap;
436 <  fileinfo: TFileInfo;
437 <  timeformat: TFormatSettings;
420 >  DataBase:  TABSDatabase;
421 >  Query:     TABSQuery;
422 >  MimeCoder: TStringFormat_MIME64;
423  
424 <  conIndex: Integer;
425 < const
426 <  steps: Byte = 4;
424 >  BeginTime, FileTime: Double;
425 >  Step:       Integer;
426 >  TimeFormat: TFormatSettings;
427  
428 +  ConID:      Integer;
429 +  Connection: TDataAccess;
430 +  ConRepMsg:  TStatusMessages;
431  
432 +  FileID:     Integer;
433  
434 +  i:          Integer;
435 +  temps:      String;
436 +  tempdata:   TByteData;
437 +  FileInfo:   TFileInfo;
438 +  DatLinks:   TDatLinkList;
439 +  RawLinks:   TRawDataList;
440 + const
441 +  steps: Byte = 2;
442  
443    procedure DoStep(stepname: String);
444    begin
# Line 452 | Line 449 | const
449      else
450        group_progress.Caption := 'Creating DB (FINISHED)';
451    end;
452 < }
452 >
453 >  procedure StopConvert;
454 >  begin
455 >    btn_abortok.Caption := '&Close';
456 >    btn_abortok.Default := True;
457 >    converting := False;
458 >    lbl_estimation.Caption := 'ABORTED';
459 >    group_progress.Caption := 'Creating DB (ABORTED)';
460 >    DataBase.Close;
461 >    if MessageBox(Self.Handle, PChar('Delete the unfinished DB-file?'),
462 >      PChar('Delete file?'), MB_YESNO) = idYes then
463 >    begin
464 >      DeleteFile(target);
465 >    end;
466 > end;
467 >
468 >
469  
470   begin
471 < {  if CreateDataConnection(Source, ODB_Dat) = nil then
471 >
472 >  //
473 >  // FILE EXISTS CHECK FÜR DAT/RAW/SEP!!!
474 >  //
475 >
476 >  TimeFormat.ShortTimeFormat := 'hh:nn:ss';
477 >  TimeFormat.LongTimeFormat  := 'hh:nn:ss';
478 >  TimeFormat.TimeSeparator   := ':';
479 >
480 >  ConID := ConManager.OpenConnection(Source, ConRepMsg);
481 >  if not (ConRepMsg in [SM_OK, SM_AlreadyOpened]) then
482    begin
483 <    ShowMessage('Could not connect to .dat-file');
483 >    ShowMessage('Source-file couldn''t be opened! Aborting' + CrLf + GetOpenMsg(ConRepMsg));
484      Exit;
485 <  end
486 <  else
485 >  end else
486 >    Connection := ConManager.Connection[ConID];
487 >
488 >  ConID := ConManager.FileOpened(Target);
489 >  if ConID >= 0 then
490    begin
491 <    TOniDataDat(OniDataConnection).UnloadWhenUnused := False;
491 >    if MessageBox(Self.Handle, PChar('Destination-file is opened, close it in ' +
492 >          'order to proceed conversion?'), PChar('Destination-file opened'),
493 >          MB_YESNO + MB_ICONQUESTION) = ID_YES then
494 >    begin
495 >      if Form_Main.CheckConnectionCloseable(ConID) then
496 >        if not ConManager.CloseConnection(ConID, ConRepMsg) then
497 >        begin
498 >          ShowMessage('Couldn''t close destination-file. Aborting');
499 >          Exit;
500 >        end;
501 >    end else begin
502 >      ShowMessage('Aborting');
503 >      Exit;
504 >    end;
505    end;
506  
507 <  timeformat.LongTimeFormat := 'hh:nn:ss';
508 <  timeformat.ShortTimeFormat := 'hh:nn:ss';
509 <  timeformat.TimeSeparator := ':';
507 >  if FileExists(Target) then
508 >  begin
509 >    if MessageBox(Self.Handle, PChar('Destination-file exists. ' +
510 >          'Overwrite it?'), PChar('Destination-file exists'),
511 >          MB_YESNO + MB_ICONWARNING) = ID_YES then
512 >    begin
513 >      if not DeleteFile(Target) then
514 >      begin
515 >        ShowMessage('Couldn''t delete file. Aborting');
516 >        Exit;
517 >      end;
518 >    end else begin
519 >      ShowMessage('Aborting');
520 >      Exit;
521 >    end;
522 >  end;
523  
524    Self.Visible := True;
525    Form_Main.Visible := False;
# Line 476 | Line 528 | begin
528    abort := False;
529    btn_abortok.Caption := '&Abort...';
530    btn_abortok.Default := False;
479  loaded_filename := target;
531  
532 <  absolutebegintime := Time;
532 >  BeginTime := Time;
533  
534    DataBase := TABSDatabase.Create(Self);
535 +  DataBase.MaxConnections := 1;
536 +  DataBase.PageSize := 8112;
537 +  DataBase.PageCountInExtent := 8;
538 +
539    DataBase.DatabaseName := 'OLDB';
540    DataBase.DatabaseFileName := target;
541    DataBase.CreateDatabase;
# Line 494 | Line 549 | begin
549    Query := TABSQuery.Create(Self);
550    Query.DatabaseName := 'OLDB';
551    Query.SQL.Text :=
552 <    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), value STRING(128) );';
552 >    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), ' +
553 >    'value STRING(128) );';
554    Query.ExecSQL;
555    Query.SQL.Text :=
556 <    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, target_id INTEGER );';
556 >    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
557 >    'src_link_offset INTEGER, target_id INTEGER);';
558 >  Query.ExecSQL;
559 >  Query.SQL.Text := 'CREATE INDEX idsrcid ON linkmap (src_id);';
560 >  Query.ExecSQL;
561 >  Query.SQL.Text := 'CREATE INDEX idtargetid ON linkmap (target_id);';
562    Query.ExecSQL;
563    Query.SQL.Text :=
564 <    '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 );';
564 >    'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
565 >    'src_link_offset INTEGER, sep BOOLEAN, size INTEGER, ' +
566 >    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib);';
567    //    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
568    Query.ExecSQL;
569 <  Query.SQL.Text :=
507 <    '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 );';
508 <  //    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
569 >  Query.SQL.Text := 'CREATE INDEX idsrcid ON rawmap (src_id);';
570    Query.ExecSQL;
571    Query.SQL.Text :=
572 <    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
572 >    'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
573 >    'name STRING(128), contenttype INTEGER, size INTEGER, ' +
574 >    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
575 >  //    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
576    Query.ExecSQL;
577 + //  Query.SQL.Text :=
578 + //    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
579 + //  Query.ExecSQL;
580  
581    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("dbversion","' +
582      dbversion + '");';
583    Query.ExecSQL;
584 <  SetLength(Data, Length(OniDataConnection.LevelInfo.Ident));
518 <  for i := 0 to High(OniDataConnection.LevelInfo.Ident) do
519 <    Data[i] := OniDataConnection.LevelInfo.Ident[i];
520 <  temps := CreateHexString(Data, True);
521 <  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("ident","' + temps + '");';
522 <  Query.ExecSQL;
584 >
585    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("lvl","' +
586 <    IntToStr(OniDataConnection.LevelInfo.LevelNumber) + '");';
586 >    IntToStr(Connection.LevelNumber) + '");';
587    Query.ExecSQL;
588 <  if OniDataConnection.OSisMAC then
589 <    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","MAC");'
590 <  else
591 <    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","PC");';
592 <  Query.ExecSQL;
531 <
532 <  DoStep('Writing extensionslist');
533 <  progress.Max := Length(OniDataConnection.GetExtensionsList);
534 <  Application.ProcessMessages;
535 <
536 <  extlist := OniDataConnection.GetExtendedExtensionsList;
537 <  for i := 0 to High(extlist) do
538 <  begin
539 <    SetLength(Data, Length(extlist[i].Ident));
540 <    for j := 0 to High(extlist[i].Ident) do
541 <      Data[j] := extlist[i].Ident[j];
542 <    temps := CreateHexString(Data, True);
543 <    temps2 := extlist[i].Extension[3] + extlist[i].Extension[2] +
544 <      extlist[i].Extension[1] + extlist[i].Extension[0];
545 <    Query.SQL.Text := 'INSERT INTO extlist (ext,ident) VALUES ("' +
546 <      temps2 + '","' + temps + '");';
547 <    Query.ExecSQL;
548 <    progress.Position    := i;
549 <    lbl_progress.Caption := 'Extensions done: ' + IntToStr(i) + '/' +
550 <      IntToStr(Length(extlist));
551 <    Application.ProcessMessages;
552 <    if abort then
553 <    begin
554 <      stop_convert;
555 <      Exit;
556 <    end;
588 >  case Connection.DataOS of
589 >    DOS_WIN: temps := 'WIN';
590 >    DOS_WINDEMO: temps := 'WINDEMO';
591 >    DOS_MAC: temps := 'MAC';
592 >    DOS_MACBETA: temps := 'MACBETA';
593    end;
594 <  lbl_progress.Caption := '';
594 >  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","' + temps + '");';
595 >  Query.ExecSQL;
596  
597    progress.Position      := 0;
598    lbl_progress.Caption   := 'Files done: ' + IntToStr(0) + '/' + IntToStr(
599 <    OniDataConnection.GetFilesCount);
599 >    Connection.GetFileCount);
600    lbl_estimation.Caption := 'Estimated finishing time: unknown';
601  
602 <  DoStep('Loading .dat into memory');
566 <  Application.ProcessMessages;
567 <
568 <  progress.Max := OniDataConnection.GetFilesCount;
602 >  progress.Max := Connection.GetFileCount;
603    begintime    := Time;
604    DoStep('Writing .dat-fileslist');
605    Application.ProcessMessages;
606  
607 +  FileTime := Time;
608    Database.StartTransaction;
609 <  for i := 0 to OniDataConnection.GetFilesCount - 1 do
609 >  for FileID := 0 to Connection.GetFileCount - 1 do
610    begin
611 <    fileinfo := OniDataConnection.GetFileInfo(i);
611 >    fileinfo := Connection.GetFileInfo(FileID);
612      if (fileinfo.FileType and $02) = 0 then
613      begin
614        mimecoder := TStringFormat_MIME64.Create;
615 <      Data      := OniDataConnection.LoadDatFile(i);
615 >      Connection.LoadDatFile(FileID, tempdata);
616        Query.SQL.Text :=
617          'INSERT INTO datfiles (id,extension,name,contenttype,size,data) VALUES (' +
618 <        IntToStr(i) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
618 >        IntToStr(FileID) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
619          fileinfo.FileType, 8) + '",' + IntToStr(fileinfo.Size) + ',MimeToBin("' +
620 <        MimeCoder.StrTo(@Data[0], Length(Data)) + '") );';
620 >        MimeCoder.StrTo(@tempdata[0], Length(tempdata)) + '") );';
621        Query.ExecSQL;
622        mimecoder.Free;
623  
624 <      rawlist := OniDataConnection.GetRawList(i);
625 <      if Length(rawlist) > 0 then
624 >      RawLinks := Connection.GetRawList(FileID);
625 >      if Length(RawLinks) > 0 then
626        begin
627 <        for j := 0 to High(rawlist) do
627 >        for i := 0 to High(RawLinks) do
628          begin
629 <          if rawlist[j].raw_size > 0 then
629 >          if RawLinks[i].RawSize > 0 then
630            begin
631 <            SetLength(Data, rawlist[j].raw_size);
632 <            OniDataConnection.LoadRawFile(i, rawlist[j].src_offset, Data);
631 >            SetLength(tempdata, RawLinks[i].RawSize);
632 >            Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, tempdata);
633              mimecoder      := TStringFormat_MIME64.Create;
634              Query.SQL.Text :=
635                'INSERT INTO rawmap (src_id,src_link_offset,sep,size,data) VALUES (' +
636 <              IntToStr(i) + ',' + IntToStr(rawlist[j].src_offset) + ',' + BoolToStr(
637 <              rawlist[j].loc_sep) + ',' + IntToStr(rawlist[j].raw_size) + ',MimeToBin("' +
638 <              MimeCoder.StrTo(@Data[0], rawlist[j].raw_size) + '") );';
636 >              IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ',' +
637 >              BoolToStr(RawLinks[i].LocSep) + ', ' +
638 >              IntToStr(RawLinks[i].RawSize) + ', ' +
639 >              'MimeToBin("' + MimeCoder.StrTo(@tempdata[0], RawLinks[i].RawSize) + '") );';
640              Query.ExecSQL;
641              mimecoder.Free;
642            end
# Line 608 | Line 644 | begin
644            begin
645              Query.SQL.Text :=
646                'INSERT INTO rawmap (src_id,src_link_offset,sep,size) VALUES (' +
647 <              IntToStr(i) + ',' + IntToStr(rawlist[j].src_offset) + ',' + BoolToStr(rawlist[j].loc_sep) + ',0);';
647 >              IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ', ' +
648 >              BoolToStr(RawLinks[i].LocSep) + ', 0);';
649              Query.ExecSQL;
650            end;
651          end;
652        end;
653  
654 <      HandleFile(fileinfo.Extension, i, True);
654 >      DatLinks := Connection.GetDatLinks(FileID);
655 >      if Length(DatLinks) > 0 then
656 >      begin
657 >        for i := 0 to High(DatLinks) do
658 >        begin
659 >          Query.SQL.Text :=
660 >            'INSERT INTO linkmap (src_id, src_link_offset, target_id) VALUES (' +
661 >            IntToStr(FileID) + ', ' + IntToStr(DatLinks[i].SrcOffset) + ', ' +
662 >            IntToStr(DatLinks[i].DestID) + ');';
663 >          Query.ExecSQL;
664 >        end;
665 >      end;
666      end
667      else
668      begin
669        Query.SQL.Text :=
670          'INSERT INTO datfiles (id,extension,name,contenttype,size) VALUES (' +
671 <        IntToStr(i) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
672 <        fileinfo.FileType, 8) + '",0);';
671 >        IntToStr(FileID) + ', "' + fileinfo.Extension + '", ' +
672 >        '"' + fileinfo.Name + '", "' + IntToHex(fileinfo.FileType, 8) + '", 0);';
673        Query.ExecSQL;
674      end;
675 <    if ((i mod 100) = 0) and (i > 0) then
675 >    if ((FileID mod 100) = 0) and (FileID > 0) then
676      begin
677        Database.Commit(False);
678        Database.StartTransaction;
679      end;
680 <    if ((i mod 10) = 0) and (i >= 100) then
680 >    if ((FileID mod 10) = 0) and (FileID >= 100) then
681        lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
682 <        (Time - begintime) / i * (progress.Max - i + 1) * 1.1, timeformat );
683 <    progress.Position := i;
684 <    lbl_progress.Caption := 'Files done: ' + IntToStr(i) + '/' + IntToStr(progress.Max);
682 >        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
683 >    progress.Position := FileID;
684 >    lbl_progress.Caption := 'Files done: ' + IntToStr(FileID) + '/' + IntToStr(progress.Max);
685      Application.ProcessMessages;
686      if abort then
687      begin
688 <      stop_convert;
688 >      StopConvert;
689        Exit;
690      end;
691    end;
# Line 646 | Line 694 | begin
694    lbl_progress.Caption   := 'Files done: ' + IntToStr(progress.Max) + '/' +
695      IntToStr(progress.Max);
696  
697 <  lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - absolutebegintime, timeformat) + ')';
697 >  lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - BeginTime, timeformat) + ')';
698  
699    DoStep('FIN');
700    btn_abortok.Caption := '&OK';
# Line 654 | Line 702 | begin
702  
703    converting := False;
704  
705 <  database.Close;
706 <  database.Free;
659 <
660 <  CloseDataConnection(DataConnections[conIndex]);
661 < }
662 < end;
663 <
664 <
665 <
666 <
667 < procedure TForm_LevelDB.StopConvert;
668 < begin
669 < {  btn_abortok.Caption := '&Close';
670 <  btn_abortok.Default := True;
671 <  converting := False;
672 <  lbl_estimation.Caption := 'ABORTED';
673 <  group_progress.Caption := 'Creating DB (ABORTED)';
705 >  Query.Close;
706 >  Query.Free;
707    DataBase.Close;
708 <  if MessageBox(Self.Handle, PChar('Delete the unfinished DB-file?'),
709 <    PChar('Delete file?'), MB_YESNO) = idYes then
677 <  begin
678 <    DeleteFile(loaded_filename);
679 <  end;
680 < }end;
708 >  DataBase.Free;
709 > end;
710  
711  
712  
# Line 699 | Line 728 | begin
728   end;
729  
730  
731 <
703 < {
704 < procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
705 < var
706 <  link: LongWord;
707 < begin
708 <  OniDataConnection.LoadDatFilePart(fileid, offset, 4, @link);
709 <  if link = 0 then
710 <    link := $FFFFFFFF
711 <  else
712 <    link := link div 256;
713 <  Query.SQL.Text := 'INSERT INTO linkmap (src_id,src_link_offset,target_id) VALUES (' +
714 <    IntToStr(fileid) + ',' + IntToStr(offset) + ',' + IntToStr(link) + ');';
715 <  Query.ExecSQL;
716 < end;
717 <
718 <
719 <
720 <
721 < procedure AISA(fileid: LongWord; dir_dat2db: Boolean);
722 < var
723 <  packages: Word;
724 <  i: LongWord;
725 < begin
726 <  if dir_dat2db then
727 <  begin
728 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
729 <    if packages > 0 then
730 <    begin
731 <      for i := 0 to packages - 1 do
732 <        InsertDatLinkToDB(fileid, $20 + i * $160 + $28);
733 <      for i := 0 to packages - 1 do
734 <        InsertDatLinkToDB(fileid, $20 + i * $160 + $150);
735 <    end;
736 <  end
737 <  else
738 <  begin
739 <  end;
740 < end;
741 <
742 <
743 <
744 <
745 < procedure AKEV(fileid: LongWord; dir_dat2db: Boolean);
746 < var
747 <  i: LongWord;
748 < begin
749 <  if dir_dat2db then
750 <  begin
751 <    for i := 0 to 16 do
752 <      InsertDatLinkToDB(fileid, $8 + i * 4);
753 <  end
754 <  else
755 <  begin
756 <  end;
757 < end;
758 <
759 <
760 <
761 <
762 < procedure AKOT(fileid: LongWord; dir_dat2db: Boolean);
763 < var
764 <  i: LongWord;
765 < begin
766 <  if dir_dat2db then
767 <  begin
768 <    for i := 0 to 4 do
769 <      InsertDatLinkToDB(fileid, $8 + i * 4);
770 <  end
771 <  else
772 <  begin
773 <  end;
774 < end;
775 <
776 <
777 <
778 <
779 < procedure CBPI(fileid: LongWord; dir_dat2db: Boolean);
780 < var
781 <  i: LongWord;
782 < begin
783 <  if dir_dat2db then
784 <  begin
785 <    for i := 0 to 56 do
786 <      InsertDatLinkToDB(fileid, $8 + i * 4);
787 <  end
788 <  else
789 <  begin
790 <  end;
791 < end;
792 <
793 <
794 <
795 <
796 < procedure CBPM(fileid: LongWord; dir_dat2db: Boolean);
797 < var
798 <  i: LongWord;
799 < begin
800 <  if dir_dat2db then
801 <  begin
802 <    for i := 0 to 18 do
803 <      InsertDatLinkToDB(fileid, $8 + i * 4);
804 <  end
805 <  else
806 <  begin
807 <  end;
808 < end;
809 <
810 <
811 <
812 <
813 < procedure CONS(fileid: LongWord; dir_dat2db: Boolean);
814 < var
815 <  i: LongWord;
816 < begin
817 <  if dir_dat2db then
818 <  begin
819 <    for i := 0 to 1 do
820 <      InsertDatLinkToDB(fileid, $24 + i * 4);
821 <  end
822 <  else
823 <  begin
824 <  end;
825 < end;
826 <
827 <
828 <
829 <
830 < procedure CRSA(fileid: LongWord; dir_dat2db: Boolean);
831 < var
832 <  packages: LongWord;
833 <  i: LongWord;
834 < begin
835 <  if dir_dat2db then
836 <  begin
837 <    OniDataConnection.LoadDatFilePart(fileid, $14, 4, @packages);
838 <    if packages > 0 then
839 <      for i := 0 to packages - 1 do
840 <        InsertDatLinkToDB(fileid, $20 + i * 1100 + $A0);
841 <  end
842 <  else
843 <  begin
844 <  end;
845 < end;
846 <
847 <
848 <
849 <
850 < procedure DOOR(fileid: LongWord; dir_dat2db: Boolean);
851 < begin
852 <  if dir_dat2db then
853 <  begin
854 <    InsertDatLinkToDB(fileid, $08);
855 <    InsertDatLinkToDB(fileid, $10);
856 <  end
857 <  else
858 <  begin
859 <  end;
860 < end;
861 <
862 <
863 <
864 <
865 < procedure DPGE(fileid: LongWord; dir_dat2db: Boolean);
866 < begin
867 <  if dir_dat2db then
868 <  begin
869 <    InsertDatLinkToDB(fileid, $40);
870 <  end
871 <  else
872 <  begin
873 <  end;
874 < end;
875 <
876 <
877 <
878 <
879 < procedure HPGE(fileid: LongWord; dir_dat2db: Boolean);
880 < begin
881 <  if dir_dat2db then
882 <  begin
883 <    InsertDatLinkToDB(fileid, $0C);
884 <  end
885 <  else
886 <  begin
887 <  end;
888 < end;
889 <
890 <
891 <
892 <
893 < procedure IGHH(fileid: LongWord; dir_dat2db: Boolean);
894 < begin
895 <  if dir_dat2db then
896 <  begin
897 <    InsertDatLinkToDB(fileid, $24);
898 <    InsertDatLinkToDB(fileid, $28);
899 <  end
900 <  else
901 <  begin
902 <  end;
903 < end;
904 <
905 <
906 <
907 <
908 < procedure IGPA(fileid: LongWord; dir_dat2db: Boolean);
909 < var
910 <  links: LongWord;
911 <  i:     LongWord;
912 < begin
913 <  if dir_dat2db then
914 <  begin
915 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @links);
916 <    if links > 0 then
917 <      for i := 0 to links - 1 do
918 <        InsertDatLinkToDB(fileid, $20 + i * 4);
919 <  end
920 <  else
921 <  begin
922 <  end;
923 < end;
924 <
925 <
926 <
927 <
928 < procedure IGPG(fileid: LongWord; dir_dat2db: Boolean);
929 < var
930 <  i: LongWord;
931 < begin
932 <  if dir_dat2db then
933 <  begin
934 <    for i := 0 to 1 do
935 <      InsertDatLinkToDB(fileid, $1C + i * 4);
936 <  end
937 <  else
938 <  begin
939 <  end;
940 < end;
941 <
942 <
943 <
944 <
945 < procedure IGSA(fileid: LongWord; dir_dat2db: Boolean);
946 < var
947 <  links: LongWord;
948 <  i:     LongWord;
949 < begin
950 <  if dir_dat2db then
951 <  begin
952 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @links);
953 <    if links > 0 then
954 <      for i := 0 to links - 1 do
955 <        InsertDatLinkToDB(fileid, $20 + i * 4);
956 <  end
957 <  else
958 <  begin
959 <  end;
960 < end;
961 <
962 <
963 <
964 <
965 < procedure IMPT(fileid: LongWord; dir_dat2db: Boolean);
966 < begin
967 <  if dir_dat2db then
968 <  begin
969 <    InsertDatLinkToDB(fileid, $10);
970 <  end
971 <  else
972 <  begin
973 <  end;
974 < end;
975 <
976 <
977 <
978 <
979 < procedure IPGE(fileid: LongWord; dir_dat2db: Boolean);
980 < begin
981 <  if dir_dat2db then
982 <  begin
983 <    InsertDatLinkToDB(fileid, $0C);
984 <  end
985 <  else
986 <  begin
987 <  end;
988 < end;
989 <
990 <
991 <
992 <
993 < procedure KEYI(fileid: LongWord; dir_dat2db: Boolean);
994 < var
995 <  i: LongWord;
996 < begin
997 <  if dir_dat2db then
998 <  begin
999 <    for i := 0 to 9 do
1000 <      InsertDatLinkToDB(fileid, $08 + i * 4);
1001 <  end
1002 <  else
1003 <  begin
1004 <  end;
1005 < end;
1006 <
1007 <
1008 <
1009 <
1010 < procedure M3GA(fileid: LongWord; dir_dat2db: Boolean);
1011 < var
1012 <  links: LongWord;
1013 <  i:     LongWord;
1014 < begin
1015 <  if dir_dat2db then
1016 <  begin
1017 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @links);
1018 <    if links > 0 then
1019 <      for i := 0 to links - 1 do
1020 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1021 <  end
1022 <  else
1023 <  begin
1024 <  end;
1025 < end;
1026 <
1027 <
1028 <
1029 <
1030 < procedure M3GM(fileid: LongWord; dir_dat2db: Boolean);
1031 < var
1032 <  i: LongWord;
1033 < begin
1034 <  if dir_dat2db then
1035 <  begin
1036 <    for i := 0 to 6 do
1037 <      InsertDatLinkToDB(fileid, $0C + i * 4);
1038 <  end
1039 <  else
1040 <  begin
1041 <  end;
1042 < end;
1043 <
1044 <
1045 <
1046 <
1047 < procedure MTRL(fileid: LongWord; dir_dat2db: Boolean);
1048 < begin
1049 <  if dir_dat2db then
1050 <  begin
1051 <    InsertDatLinkToDB(fileid, $10);
1052 <  end
1053 <  else
1054 <  begin
1055 <  end;
1056 < end;
1057 <
1058 <
1059 <
1060 <
1061 < procedure OBDC(fileid: LongWord; dir_dat2db: Boolean);
1062 < var
1063 <  packages: Word;
1064 <  i: LongWord;
1065 < begin
1066 <  if dir_dat2db then
1067 <  begin
1068 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1069 <    if packages > 0 then
1070 <      for i := 0 to packages - 1 do
1071 <        InsertDatLinkToDB(fileid, $20 + i * $18 + $4);
1072 <  end
1073 <  else
1074 <  begin
1075 <  end;
1076 < end;
1077 <
1078 <
1079 <
1080 <
1081 < procedure OBOA(fileid: LongWord; dir_dat2db: Boolean);
1082 < var
1083 <  packages: Word;
1084 <  i: LongWord;
1085 < begin
1086 <  if dir_dat2db then
1087 <  begin
1088 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1089 <    if packages > 0 then
1090 <      for i := 0 to packages - 1 do
1091 <      begin
1092 <        InsertDatLinkToDB(fileid, $20 + i * 240 + $0);
1093 <        InsertDatLinkToDB(fileid, $20 + i * 240 + $4);
1094 <        InsertDatLinkToDB(fileid, $20 + i * 240 + $8);
1095 <      end;
1096 <  end
1097 <  else
1098 <  begin
1099 <  end;
1100 < end;
1101 <
1102 <
1103 <
1104 <
1105 < procedure OFGA(fileid: LongWord; dir_dat2db: Boolean);
1106 < var
1107 <  packages: LongWord;
1108 <  i: LongWord;
1109 < begin
1110 <  if dir_dat2db then
1111 <  begin
1112 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1113 <    if packages > 0 then
1114 <      for i := 0 to packages - 1 do
1115 <        InsertDatLinkToDB(fileid, $20 + i * 12 + $04);
1116 <  end
1117 <  else
1118 <  begin
1119 <  end;
1120 < end;
1121 <
1122 <
1123 <
1124 <
1125 < procedure ONCC(fileid: LongWord; dir_dat2db: Boolean);
1126 < var
1127 <  i: LongWord;
1128 < begin
1129 <  if dir_dat2db then
1130 <  begin
1131 <    InsertDatLinkToDB(fileid, $28);
1132 <    InsertDatLinkToDB(fileid, $434);
1133 <    InsertDatLinkToDB(fileid, $438);
1134 <    InsertDatLinkToDB(fileid, $43C);
1135 <    InsertDatLinkToDB(fileid, $C3C);
1136 <    InsertDatLinkToDB(fileid, $C40);
1137 <    InsertDatLinkToDB(fileid, $C44);
1138 <    InsertDatLinkToDB(fileid, $C48);
1139 <    InsertDatLinkToDB(fileid, $C88);
1140 <    InsertDatLinkToDB(fileid, $C8C);
1141 <  end
1142 <  else
1143 <  begin
1144 <  end;
1145 < end;
1146 <
1147 <
1148 <
1149 <
1150 < procedure ONCV(fileid: LongWord; dir_dat2db: Boolean);
1151 < begin
1152 <  if dir_dat2db then
1153 <  begin
1154 <    InsertDatLinkToDB(fileid, $08);
1155 <  end
1156 <  else
1157 <  begin
1158 <  end;
1159 < end;
1160 <
1161 <
1162 <
1163 <
1164 < procedure ONLV(fileid: LongWord; dir_dat2db: Boolean);
1165 < var
1166 <  i: LongWord;
1167 < begin
1168 <  if dir_dat2db then
1169 <  begin
1170 <    for i := 0 to 5 do
1171 <      InsertDatLinkToDB(fileid, $48 + i * 4);
1172 <    for i := 0 to 5 do
1173 <      InsertDatLinkToDB(fileid, $64 + i * 4);
1174 <    InsertDatLinkToDB(fileid, $300);
1175 <  end
1176 <  else
1177 <  begin
1178 <  end;
1179 < end;
1180 <
1181 <
1182 <
1183 <
1184 < procedure ONOA(fileid: LongWord; dir_dat2db: Boolean);
1185 < var
1186 <  packages: LongWord;
1187 <  i: LongWord;
1188 < begin
1189 <  if dir_dat2db then
1190 <  begin
1191 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1192 <    if packages > 0 then
1193 <      for i := 0 to packages - 1 do
1194 <        InsertDatLinkToDB(fileid, $20 + i * 8 + $04);
1195 <  end
1196 <  else
1197 <  begin
1198 <  end;
1199 < end;
1200 <
1201 <
1202 <
1203 <
1204 < procedure ONSK(fileid: LongWord; dir_dat2db: Boolean);
1205 < begin
1206 <  if dir_dat2db then
1207 <  begin
1208 <    InsertDatLinkToDB(fileid, $08);
1209 <    InsertDatLinkToDB(fileid, $0C);
1210 <    InsertDatLinkToDB(fileid, $10);
1211 <    InsertDatLinkToDB(fileid, $14);
1212 <    InsertDatLinkToDB(fileid, $18);
1213 <    InsertDatLinkToDB(fileid, $20);
1214 <    InsertDatLinkToDB(fileid, $44);
1215 <  end
1216 <  else
1217 <  begin
1218 <  end;
1219 < end;
1220 <
1221 <
1222 <
1223 <
1224 < procedure ONVL(fileid: LongWord; dir_dat2db: Boolean);
1225 < var
1226 <  packages: LongWord;
1227 <  i: LongWord;
1228 < begin
1229 <  if dir_dat2db then
1230 <  begin
1231 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1232 <    if packages > 0 then
1233 <      for i := 0 to packages - 1 do
1234 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1235 <  end
1236 <  else
1237 <  begin
1238 <  end;
1239 < end;
1240 <
1241 <
1242 <
1243 <
1244 < procedure ONWC(fileid: LongWord; dir_dat2db: Boolean);
1245 < begin
1246 <  if dir_dat2db then
1247 <  begin
1248 <    InsertDatLinkToDB(fileid, $28);
1249 <    InsertDatLinkToDB(fileid, $34);
1250 <    InsertDatLinkToDB(fileid, $40);
1251 <    InsertDatLinkToDB(fileid, $54);
1252 <    InsertDatLinkToDB(fileid, $58);
1253 <    InsertDatLinkToDB(fileid, $5C);
1254 <    InsertDatLinkToDB(fileid, $60);
1255 <    InsertDatLinkToDB(fileid, $6FC);
1256 <    InsertDatLinkToDB(fileid, $700);
1257 <  end
1258 <  else
1259 <  begin
1260 <  end;
1261 < end;
1262 <
1263 <
1264 <
1265 <
1266 < procedure OPGE(fileid: LongWord; dir_dat2db: Boolean);
1267 < begin
1268 <  if dir_dat2db then
1269 <  begin
1270 <    InsertDatLinkToDB(fileid, $0C);
1271 <  end
1272 <  else
1273 <  begin
1274 <  end;
1275 < end;
1276 <
1277 <
1278 <
1279 <
1280 < procedure PSPC(fileid: LongWord; dir_dat2db: Boolean);
1281 < begin
1282 <  if dir_dat2db then
1283 <  begin
1284 <    InsertDatLinkToDB(fileid, $50);
1285 <  end
1286 <  else
1287 <  begin
1288 <  end;
1289 < end;
1290 <
1291 <
1292 <
1293 <
1294 < procedure PSPL(fileid: LongWord; dir_dat2db: Boolean);
1295 < var
1296 <  packages: LongWord;
1297 <  i: LongWord;
1298 < begin
1299 <  if dir_dat2db then
1300 <  begin
1301 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1302 <    if packages > 0 then
1303 <      for i := 0 to packages - 1 do
1304 <        InsertDatLinkToDB(fileid, $20 + i * 8 + $4);
1305 <  end
1306 <  else
1307 <  begin
1308 <  end;
1309 < end;
1310 <
1311 <
1312 <
1313 <
1314 < procedure PSUI(fileid: LongWord; dir_dat2db: Boolean);
1315 < var
1316 <  i: LongWord;
1317 < begin
1318 <  if dir_dat2db then
1319 <  begin
1320 <    for i := 0 to 43 do
1321 <      InsertDatLinkToDB(fileid, $08 + i * 4);
1322 <  end
1323 <  else
1324 <  begin
1325 <  end;
1326 < end;
1327 <
1328 <
1329 <
1330 <
1331 < procedure STNA(fileid: LongWord; dir_dat2db: Boolean);
1332 < var
1333 <  packages: Word;
1334 <  i: LongWord;
1335 < begin
1336 <  if dir_dat2db then
1337 <  begin
1338 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1339 <    if packages > 0 then
1340 <      for i := 0 to packages - 1 do
1341 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1342 <  end
1343 <  else
1344 <  begin
1345 <  end;
1346 < end;
1347 <
1348 <
1349 <
1350 <
1351 < procedure TRAC(fileid: LongWord; dir_dat2db: Boolean);
1352 < var
1353 <  packages: Word;
1354 <  i: LongWord;
1355 < begin
1356 <  if dir_dat2db then
1357 <  begin
1358 <    InsertDatLinkToDB(fileid, $18);
1359 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1360 <    if packages > 0 then
1361 <      for i := 0 to packages - 1 do
1362 <        InsertDatLinkToDB(fileid, $20 + i * 12 + 8);
1363 <  end
1364 <  else
1365 <  begin
1366 <  end;
1367 < end;
1368 <
1369 <
1370 <
1371 <
1372 < procedure TRAM(fileid: LongWord; dir_dat2db: Boolean);
1373 < begin
1374 <  if dir_dat2db then
1375 <  begin
1376 <    InsertDatLinkToDB(fileid, $40);
1377 <    InsertDatLinkToDB(fileid, $44);
1378 <  end
1379 <  else
1380 <  begin
1381 <  end;
1382 < end;
1383 <
1384 <
1385 <
1386 <
1387 < procedure TRAS(fileid: LongWord; dir_dat2db: Boolean);
1388 < begin
1389 <  if dir_dat2db then
1390 <  begin
1391 <    InsertDatLinkToDB(fileid, $08);
1392 <  end
1393 <  else
1394 <  begin
1395 <  end;
1396 < end;
1397 <
1398 <
1399 <
1400 <
1401 < procedure TRBS(fileid: LongWord; dir_dat2db: Boolean);
1402 < var
1403 <  i: LongWord;
1404 < begin
1405 <  if dir_dat2db then
1406 <  begin
1407 <    for i := 0 to 4 do
1408 <      InsertDatLinkToDB(fileid, $08 + i * 4);
1409 <  end
1410 <  else
1411 <  begin
1412 <  end;
1413 < end;
1414 <
1415 <
1416 <
1417 <
1418 < procedure TRCM(fileid: LongWord; dir_dat2db: Boolean);
1419 < var
1420 <  i: LongWord;
1421 < begin
1422 <  if dir_dat2db then
1423 <  begin
1424 <    for i := 0 to 2 do
1425 <      InsertDatLinkToDB(fileid, $5C + i * 4);
1426 <  end
1427 <  else
1428 <  begin
1429 <  end;
1430 < end;
1431 <
1432 <
1433 <
1434 <
1435 < procedure TRGA(fileid: LongWord; dir_dat2db: Boolean);
1436 < var
1437 <  i: LongWord;
1438 <  packages: Word;
1439 < begin
1440 <  if dir_dat2db then
1441 <  begin
1442 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1443 <    if packages > 0 then
1444 <      for i := 0 to packages - 1 do
1445 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1446 <  end
1447 <  else
1448 <  begin
1449 <  end;
1450 < end;
1451 <
1452 <
1453 <
1454 <
1455 < procedure TRGE(fileid: LongWord; dir_dat2db: Boolean);
1456 < begin
1457 <  if dir_dat2db then
1458 <  begin
1459 <    InsertDatLinkToDB(fileid, $20);
1460 <  end
1461 <  else
1462 <  begin
1463 <  end;
1464 < end;
1465 <
1466 <
1467 <
1468 <
1469 < procedure TRIG(fileid: LongWord; dir_dat2db: Boolean);
1470 < begin
1471 <  if dir_dat2db then
1472 <  begin
1473 <    InsertDatLinkToDB(fileid, $18);
1474 <    InsertDatLinkToDB(fileid, $24);
1475 <    InsertDatLinkToDB(fileid, $28);
1476 <  end
1477 <  else
1478 <  begin
1479 <  end;
1480 < end;
1481 <
1482 <
1483 <
1484 <
1485 < procedure TRMA(fileid: LongWord; dir_dat2db: Boolean);
1486 < var
1487 <  i: LongWord;
1488 <  packages: Word;
1489 < begin
1490 <  if dir_dat2db then
1491 <  begin
1492 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1493 <    if packages > 0 then
1494 <      for i := 0 to packages - 1 do
1495 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1496 <  end
1497 <  else
1498 <  begin
1499 <  end;
1500 < end;
1501 <
1502 <
1503 <
1504 <
1505 < procedure TRSC(fileid: LongWord; dir_dat2db: Boolean);
1506 < var
1507 <  i: LongWord;
1508 <  packages: Word;
1509 < begin
1510 <  if dir_dat2db then
1511 <  begin
1512 <    OniDataConnection.LoadDatFilePart(fileid, $1E, 2, @packages);
1513 <    if packages > 0 then
1514 <      for i := 0 to packages - 1 do
1515 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1516 <  end
1517 <  else
1518 <  begin
1519 <  end;
1520 < end;
1521 <
1522 <
1523 <
1524 <
1525 < procedure TSFF(fileid: LongWord; dir_dat2db: Boolean);
1526 < var
1527 <  i: LongWord;
1528 <  packages: LongWord;
1529 < begin
1530 <  if dir_dat2db then
1531 <  begin
1532 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1533 <    if packages > 0 then
1534 <      for i := 0 to packages - 1 do
1535 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1536 <  end
1537 <  else
1538 <  begin
1539 <  end;
1540 < end;
1541 <
1542 <
1543 <
1544 <
1545 < procedure TSFT(fileid: LongWord; dir_dat2db: Boolean);
1546 < begin
1547 <  if dir_dat2db then
1548 <  begin
1549 <    InsertDatLinkToDB(fileid, $1C);
1550 <  end
1551 <  else
1552 <  begin
1553 <  end;
1554 < end;
1555 <
1556 <
1557 <
1558 <
1559 < procedure TURR(fileid: LongWord; dir_dat2db: Boolean);
1560 < begin
1561 <  if dir_dat2db then
1562 <  begin
1563 <    InsertDatLinkToDB(fileid, $60);
1564 <    InsertDatLinkToDB(fileid, $6C);
1565 <    InsertDatLinkToDB(fileid, $74);
1566 <  end
1567 <  else
1568 <  begin
1569 <  end;
1570 < end;
1571 <
1572 <
1573 <
1574 <
1575 < procedure TXAN(fileid: LongWord; dir_dat2db: Boolean);
1576 < var
1577 <  i: LongWord;
1578 <  packages: LongWord;
1579 < begin
1580 <  if dir_dat2db then
1581 <  begin
1582 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1583 <    if packages > 0 then
1584 <      for i := 0 to packages - 1 do
1585 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1586 <  end
1587 <  else
1588 <  begin
1589 <  end;
1590 < end;
1591 <
1592 <
1593 <
1594 <
1595 < procedure TXMA(fileid: LongWord; dir_dat2db: Boolean);
1596 < var
1597 <  i: LongWord;
1598 <  packages: LongWord;
1599 < begin
1600 <  if dir_dat2db then
1601 <  begin
1602 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1603 <    if packages > 0 then
1604 <      for i := 0 to packages - 1 do
1605 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1606 <  end
1607 <  else
1608 <  begin
1609 <  end;
1610 < end;
1611 <
1612 <
1613 <
1614 <
1615 < procedure TXMB(fileid: LongWord; dir_dat2db: Boolean);
1616 < var
1617 <  i: LongWord;
1618 <  packages: LongWord;
1619 < begin
1620 <  if dir_dat2db then
1621 <  begin
1622 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1623 <    if packages > 0 then
1624 <      for i := 0 to packages - 1 do
1625 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1626 <  end
1627 <  else
1628 <  begin
1629 <  end;
1630 < end;
1631 <
1632 <
1633 <
1634 <
1635 < procedure TXMP(fileid: LongWord; dir_dat2db: Boolean);
1636 < begin
1637 <  if dir_dat2db then
1638 <  begin
1639 <    InsertDatLinkToDB(fileid, $94);
1640 <    InsertDatLinkToDB(fileid, $98);
1641 <  end
1642 <  else
1643 <  begin
1644 <  end;
1645 < end;
1646 <
1647 <
1648 <
1649 <
1650 < procedure TXTC(fileid: LongWord; dir_dat2db: Boolean);
1651 < begin
1652 <  if dir_dat2db then
1653 <  begin
1654 <    InsertDatLinkToDB(fileid, $08);
1655 <  end
1656 <  else
1657 <  begin
1658 <  end;
1659 < end;
1660 <
1661 <
1662 <
1663 <
1664 < procedure WMCL(fileid: LongWord; dir_dat2db: Boolean);
1665 < var
1666 <  i: LongWord;
1667 <  packages: LongWord;
1668 < begin
1669 <  if dir_dat2db then
1670 <  begin
1671 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1672 <    if packages > 0 then
1673 <      for i := 0 to packages - 1 do
1674 <        InsertDatLinkToDB(fileid, $20 + i * 8 + $4);
1675 <  end
1676 <  else
1677 <  begin
1678 <  end;
1679 < end;
1680 <
1681 <
1682 <
1683 <
1684 < procedure WMDD(fileid: LongWord; dir_dat2db: Boolean);
1685 < var
1686 <  i: LongWord;
1687 <  packages: LongWord;
1688 < begin
1689 <  if dir_dat2db then
1690 <  begin
1691 <    OniDataConnection.LoadDatFilePart(fileid, $11C, 4, @packages);
1692 <    if packages > 0 then
1693 <      for i := 0 to packages - 1 do
1694 <        InsertDatLinkToDB(fileid, $120 + i * $124 + $114);
1695 <  end
1696 <  else
1697 <  begin
1698 <  end;
1699 < end;
1700 <
1701 <
1702 <
1703 <
1704 < procedure WMMB(fileid: LongWord; dir_dat2db: Boolean);
1705 < var
1706 <  i: LongWord;
1707 <  packages: LongWord;
1708 < begin
1709 <  if dir_dat2db then
1710 <  begin
1711 <    OniDataConnection.LoadDatFilePart(fileid, $1C, 4, @packages);
1712 <    if packages > 0 then
1713 <      for i := 0 to packages - 1 do
1714 <        InsertDatLinkToDB(fileid, $20 + i * 4);
1715 <  end
1716 <  else
1717 <  begin
1718 <  end;
1719 < end;
1720 <
1721 <
1722 <
1723 <
1724 < procedure WPGE(fileid: LongWord; dir_dat2db: Boolean);
1725 < begin
1726 <  if dir_dat2db then
1727 <  begin
1728 <    InsertDatLinkToDB(fileid, $08);
1729 <    InsertDatLinkToDB(fileid, $0C);
1730 <  end
1731 <  else
1732 <  begin
1733 <  end;
1734 < end;
1735 < }
1736 <
1737 <
1738 < {
1739 < procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1740 < begin
1741 <  SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
1742 <  ConvertHandlers[High(ConvertHandlers)].Ext     := ext;
1743 <  ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1744 <  ConvertHandlers[High(ConvertHandlers)].handler := handler;
1745 < end;
1746 < }
1747 < begin
1748 < {  InsertHandler('ABNA', False, nil);
1749 <  //  InsertHandler('AGDB',True,AGDB);
1750 <  InsertHandler('AGDB', False, nil);
1751 <  InsertHandler('AGQC', False, nil);
1752 <  InsertHandler('AGQG', False, nil);
1753 <  InsertHandler('AGQR', False, nil);
1754 <  InsertHandler('AISA', True, AISA);
1755 <  InsertHandler('AITR', False, nil);
1756 <  InsertHandler('AKAA', False, nil);
1757 <  InsertHandler('AKBA', False, nil);
1758 <  InsertHandler('AKBP', False, nil);
1759 <  InsertHandler('AKDA', False, nil);
1760 <  InsertHandler('AKEV', True, AKEV);
1761 <  InsertHandler('AKOT', True, AKOT);
1762 <  InsertHandler('AKVA', False, nil);
1763 <  InsertHandler('BINA', False, nil);
1764 <  InsertHandler('CBPI', True, CBPI);
1765 <  InsertHandler('CBPM', True, CBPM);
1766 <  InsertHandler('CONS', True, CONS);
1767 <  InsertHandler('CRSA', True, CRSA);
1768 <  InsertHandler('DOOR', True, DOOR);
1769 <  InsertHandler('DPGE', True, DPGE);
1770 <  InsertHandler('ENVP', False, nil);
1771 <  InsertHandler('FILM', False, nil);
1772 <  InsertHandler('HPGE', True, HPGE);
1773 <  InsertHandler('IDXA', False, nil);
1774 <  InsertHandler('IGHH', True, IGHH);
1775 <  InsertHandler('IGPA', True, IGPA);
1776 <  InsertHandler('IGPG', True, IGPG);
1777 <  InsertHandler('IGSA', True, IGSA);
1778 <  InsertHandler('IMPT', True, IMPT);
1779 <  InsertHandler('IPGE', True, IPGE);
1780 <  InsertHandler('KEYI', True, KEYI);
1781 <  InsertHandler('M3GA', True, M3GA);
1782 <  InsertHandler('M3GM', True, M3GM);
1783 <  InsertHandler('MTRL', True, MTRL);
1784 <  InsertHandler('OBAN', False, nil);
1785 <  InsertHandler('OBDC', True, OBDC);
1786 <  InsertHandler('OBOA', True, OBOA);
1787 <  InsertHandler('OFGA', True, OFGA);
1788 <  InsertHandler('ONCC', True, ONCC);
1789 <  InsertHandler('ONCP', False, nil);
1790 <  InsertHandler('ONCV', True, ONCV);
1791 <  InsertHandler('ONFA', False, nil);
1792 <  InsertHandler('ONGS', False, nil);
1793 <  InsertHandler('ONIA', False, nil);
1794 <  InsertHandler('ONLD', False, nil);
1795 <  InsertHandler('ONLV', True, ONLV);
1796 <  InsertHandler('ONMA', False, nil);
1797 <  InsertHandler('ONOA', True, ONOA);
1798 <  InsertHandler('ONSA', False, nil);
1799 <  InsertHandler('ONSK', True, ONSK);
1800 <  InsertHandler('ONTA', False, nil);
1801 <  InsertHandler('ONVL', True, ONVL);
1802 <  InsertHandler('ONWC', True, ONWC);
1803 <  InsertHandler('OPGE', True, OPGE);
1804 <  InsertHandler('OSBD', False, nil);
1805 <  InsertHandler('OTIT', False, nil);
1806 <  InsertHandler('OTLF', False, nil);
1807 <  InsertHandler('PLEA', False, nil);
1808 <  InsertHandler('PNTA', False, nil);
1809 <  InsertHandler('PSPC', True, PSPC);
1810 <  InsertHandler('PSPL', True, PSPL);
1811 <  InsertHandler('PSUI', True, PSUI);
1812 <  InsertHandler('QTNA', False, nil);
1813 <  InsertHandler('SNDD', False, nil);
1814 <  InsertHandler('STNA', True, STNA);
1815 <  InsertHandler('SUBT', False, nil);
1816 <  InsertHandler('TRAC', True, TRAC);
1817 <  InsertHandler('TRAM', True, TRAM);
1818 <  InsertHandler('TRAS', True, TRAS);
1819 <  InsertHandler('TRBS', True, TRBS);
1820 <  InsertHandler('TRCM', True, TRCM);
1821 <  InsertHandler('TRGA', True, TRGA);
1822 <  InsertHandler('TRGE', True, TRGE);
1823 <  InsertHandler('TRIA', False, nil);
1824 <  InsertHandler('TRIG', True, TRIG);
1825 <  InsertHandler('TRMA', True, TRMA);
1826 <  InsertHandler('TRSC', True, TRSC);
1827 <  InsertHandler('TRTA', False, nil);
1828 <  InsertHandler('TSFF', True, TSFF);
1829 <  InsertHandler('TSFL', False, nil);
1830 <  InsertHandler('TSFT', True, TSFT);
1831 <  InsertHandler('TSGA', False, nil);
1832 <  InsertHandler('TSTR', False, nil);
1833 <  InsertHandler('TURR', True, TURR);
1834 <  InsertHandler('TXAN', True, TXAN);
1835 <  InsertHandler('TXCA', False, nil);
1836 <  InsertHandler('TXMA', True, TXMA);
1837 <  InsertHandler('TXMB', True, TXMB);
1838 <  InsertHandler('TXMP', True, TXMP);
1839 <  InsertHandler('TXTC', True, TXTC);
1840 <  InsertHandler('VCRA', False, nil);
1841 <  InsertHandler('WMCL', True, WMCL);
1842 <  InsertHandler('WMDD', True, WMDD);
1843 <  InsertHandler('WMM_', False, nil);
1844 <  InsertHandler('WMMB', True, WMMB);
1845 <  InsertHandler('WPGE', True, WPGE);
1846 < }end.
731 > end.

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)