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

Diff Legend

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