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 241 by alloc, Tue Jul 17 22:27:16 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;
28 <
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 >  Access_OniArchive;
29  
30   var
40 –  ConvertHandlers: array of TConvertHandler;
41 – //  loaded_filename: String;
31    Converting:  Boolean = False;
32    Abort:       Boolean = False;
33  
# Line 56 | Line 45 | end;
45  
46  
47   procedure TForm_LevelDB.CreateLevel(Source, Target: String);
48 + const
49 +  EmptyBytes: Array[0..31] of Byte = (
50 +      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 );
51   var
52    DatHeader:        THeader;
53    FilesHeader:      TFilesMap;
# Line 65 | Line 57 | var
57    Stream_Body, Stream_Names:          TMemoryStream;
58    Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
59  
68 – //  Data, rawdata: Tdata;
60    BeginTime, FileTime: Double;
61    Step:     Integer;
71 – //  rawlist:  TRawDataList;
72 – //  datlinks: TDatLinks;
73 –  OniImage:   TOniImage;
62    LevelID:    Integer;
63    TimeFormat: TFormatSettings;
64  
# Line 104 | Line 92 | const
92        group_progress.Caption := 'Creating Dat (FINISHED)';
93    end;
94  
95 +  procedure StopConvert;
96 +  begin
97 +    btn_abortok.Caption := '&Close';
98 +    btn_abortok.Default := True;
99 +    converting := False;
100 +    lbl_estimation.Caption := 'ABORTED';
101 +    group_progress.Caption := 'Creating Level (ABORTED)';
102 +
103 +    Stream_Body.Free;
104 +    Stream_Names.Free;
105 +    DatFileStream.Free;
106 +    RawFileStream.Free;
107 +    
108 +    Stream_Dat.Free;
109 +    Stream_Raw.Free;
110 +    if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
111 +      Stream_Sep.Free;
112 +    
113 +    if MessageBox(Self.Handle, PChar('Delete the unfinished level-files?'),
114 +      PChar('Delete files?'), MB_YESNO) = idYes then
115 +    begin
116 +      DeleteFile(target);
117 +      DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw'));
118 +      if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
119 +        DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep'));
120 +    end;
121 +  end;
122 +
123   begin
124  
125    //
# Line 151 | Line 167 | begin
167        begin
168          ShowMessage('Couldn''t delete file. Aborting');
169          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;
170        end;
171 +      if FileExists(AnsiReplaceStr(Target, '.dat', '.raw')) then
172 +        if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.raw')) then
173 +        begin
174 +          ShowMessage('Couldn''t delete file. Aborting');
175 +          Exit;
176 +        end;
177 +      if FileExists(AnsiReplaceStr(Target, '.dat', '.sep')) then
178 +        if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
179 +          if not DeleteFile(AnsiReplaceStr(Target, '.dat', '.sep')) then
180 +          begin
181 +            ShowMessage('Couldn''t delete file. Aborting');
182 +            Exit;
183 +          end;
184      end else begin
185        ShowMessage('Aborting');
186        Exit;
# Line 168 | Line 189 | begin
189  
190    LevelID  := Connection.LevelNumber;
191    LevelID  := (LevelID * 2) * 256 * 256 * 256 + $01;
171 –  OniImage := TOniImage.Create;
192  
193    Self.Visible := True;
194    Form_Main.Visible := False;
# Line 183 | Line 203 | begin
203    Stream_Names := TMemoryStream.Create;
204    Stream_Dat   := TFileStream.Create(Target, fmCreate);
205    Stream_Raw   := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.raw'), fmCreate);
206 +  Stream_Raw.Write(EmptyBytes[0], 32);
207    if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
208 +  begin
209      Stream_Sep := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.sep'), fmCreate);
210 +    Stream_Sep.Write(EmptyBytes[0], 32);
211 +  end;
212 +
213  
214    DoStep('Creating header');
215    progress.Position      := 0;
# Line 213 | Line 238 | begin
238    for i := 0 to High(DatHeader.OSIdent) do
239      case Connection.DataOS of
240        DOS_WIN: DatHeader.OSIdent[i] := HeaderOSIdentWin[i];
241 <      DOS_MAC: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
241 >      DOS_MAC, DOS_WINDEMO: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
242        DOS_MACBETA: DatHeader.OSIdent[i] := HeaderOSIdentMacBeta[i];
243      end;
244    for i := 0 to High(DatHeader.GlobalIdent) do
# Line 254 | Line 279 | begin
279      begin
280        case Connection.DataOS of
281          DOS_WIN:     ExtensionsHeader[i].Ident := FileTypes[j].IdentWin;
282 <        DOS_WINDEMO: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
282 >        DOS_WINDEMO:
283 >            if FileTypes[j].Extension = 'SNDD' then
284 >              ExtensionsHeader[i].Ident := FileTypes[j].IdentWin
285 >            else
286 >              ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
287          DOS_MAC:     ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
288          DOS_MACBETA: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
289        end;
# Line 286 | Line 315 | begin
315        FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
316        DatFileStream := TMemoryStream.Create;
317        Connection.LoadDatFile(FileID, TStream(DatFileStream));
318 <      DatFileStream.Seek(4, soFromBeginning);
318 >      DatFileStream.Seek(0, soFromBeginning);
319 >      tempi := FileID * 256 + 1;
320 >      DatFileStream.Write(tempi, 4);
321        DatFileStream.Write(LevelID, 4);
322  
323        DatLinks := Connection.GetDatLinks(FileID);
# Line 317 | Line 348 | begin
348              begin
349                RawLinks[i].RawAddr := Stream_Sep.Size;
350                Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
351 +              if (Stream_Sep.Size mod 32) > 0 then
352 +                Stream_Sep.Write(EmptyBytes[0], 32 - (Stream_Sep.Size mod 32));
353              end else begin
354                RawLinks[i].RawAddr := Stream_Raw.Size;
355                Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
356 +              if (Stream_Raw.Size mod 32) > 0 then
357 +                Stream_Raw.Write(EmptyBytes[0], 32 - (Stream_Raw.Size mod 32));
358              end;
359            end else
360              RawLinks[i].RawAddr := 0;
# Line 329 | Line 364 | begin
364        end;
365        DatFileStream.Seek(0, soFromBeginning);
366        Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
367 +      if (Stream_Body.Size mod 32) > 0 then
368 +      begin
369 +        ShowMessage(
370 +            IntToStr(FileID) + '-' + FileInfo.Name + '.' + FileInfo.Extension + #13#10 +
371 +            IntToStr(FileInfo.Size) + ' - 0x' + IntToHex(FileInfo.Size, 6) + ' - real: ' + IntToStr(DatFileStream.Size) + ' - 0x' + IntToHex(DatFileStream.Size, 6) + #13#10 +
372 +            IntToStr(Stream_Body.Size) + ' - 0x' + IntToHex(Stream_Body.Size, 6) );
373 +        Stream_Body.Write(EmptyBytes[0], 32 - (Stream_Body.Size mod 32));
374 +      end;
375      end
376      else
377 <      FilesHeader[i].DataAddr := 0;
377 >      FilesHeader[FileID].DataAddr := 0;
378      if Length(fileinfo.Name) > 0 then
379      begin
380 <      FilesHeader[i].NameAddr := Stream_Names.Size;
380 >      FilesHeader[FileID].NameAddr := Stream_Names.Size;
381        temps := fileinfo.Extension + fileinfo.Name + Chr(0);
382        Stream_Names.Write(temps[1], Length(temps));
383      end
384      else
385 <      FilesHeader[i].NameAddr := 0;
386 <    FilesHeader[i].FileSize := fileinfo.Size;
387 <    FilesHeader[i].FileType := fileinfo.FileType;
385 >      FilesHeader[FileID].NameAddr := 0;
386 >    FilesHeader[FileID].FileSize := fileinfo.Size;
387 >    FilesHeader[FileID].FileType := fileinfo.FileType;
388  
389 <    if ((i mod 10) = 0) and (i >= 100) then
389 >    if ((FileID mod 10) = 0) and (FileID >= 100) then
390        lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
391 <        (Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
392 <    progress.Position := i + 1;
393 <    lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
391 >        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, TimeFormat );
392 >    progress.Position := FileID + 1;
393 >    lbl_progress.Caption := 'Files done: ' + IntToStr(FileID + 1) + '/' + IntToStr(progress.Max);
394      Application.ProcessMessages;
395    end;
396  
# Line 359 | Line 402 | begin
402    for i := 0 to High(ExtensionsHeader) do
403      Stream_Dat.Write(ExtensionsHeader[i], SizeOf(ExtensionsHeader[i]));
404  
405 +  if (Stream_Dat.Size mod 32) > 0 then
406 +    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
407 +
408    DatHeader.DataSize  := Stream_Body.Size;
409    DatHeader.NamesSize := Stream_Names.Size;
410    DatHeader.DataAddr  := Stream_Dat.Size;
411 +
412    Stream_Body.Seek(0, soFromBeginning);
413    Stream_Dat.CopyFrom(Stream_Body, Stream_Body.Size);
414 +
415 +  if (Stream_Dat.Size mod 32) > 0 then
416 +    Stream_Dat.Write(EmptyBytes[0], 32 - (Stream_Dat.Size mod 32));
417 +
418    DatHeader.NamesAddr := Stream_Dat.Size;
419    Stream_Names.Seek(0, soFromBeginning);
420    Stream_Dat.CopyFrom(Stream_Names, Stream_Names.Size);
# Line 388 | Line 439 | begin
439    btn_abortok.Caption := '&OK';
440    btn_abortok.Default := True;
441  
391 –  OniImage.Free;
392 –
442    converting := False;
443  
444   //  CloseDataConnection(DataConnections[conIndex]);
# Line 398 | Line 447 | end;
447  
448  
449  
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 –
450   procedure TForm_LevelDB.CreateDatabase(Source, target: String);
420 – {
451   var
452 <  DataBase:    TABSDatabase;
453 <  Query:       TABSQuery;
454 <  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;
452 >  DataBase:  TABSDatabase;
453 >  Query:     TABSQuery;
454 >  MimeCoder: TStringFormat_MIME64;
455  
456 <  conIndex: Integer;
457 < const
458 <  steps: Byte = 4;
456 >  BeginTime, FileTime: Double;
457 >  Step:       Integer;
458 >  TimeFormat: TFormatSettings;
459  
460 +  ConID:      Integer;
461 +  Connection: TDataAccess;
462 +  ConRepMsg:  TStatusMessages;
463  
464 +  FileID:     Integer;
465  
466 +  i:          Integer;
467 +  temps:      String;
468 +  tempdata:   TByteData;
469 +  FileInfo:   TFileInfo;
470 +  DatLinks:   TDatLinkList;
471 +  RawLinks:   TRawDataList;
472 + const
473 +  steps: Byte = 2;
474  
475    procedure DoStep(stepname: String);
476    begin
# Line 449 | Line 481 | const
481      else
482        group_progress.Caption := 'Creating DB (FINISHED)';
483    end;
484 < }
484 >
485 >  procedure StopConvert;
486 >  begin
487 >    btn_abortok.Caption := '&Close';
488 >    btn_abortok.Default := True;
489 >    converting := False;
490 >    lbl_estimation.Caption := 'ABORTED';
491 >    group_progress.Caption := 'Creating DB (ABORTED)';
492 >    DataBase.Close;
493 >    if MessageBox(Self.Handle, PChar('Delete the unfinished DB-file?'),
494 >      PChar('Delete file?'), MB_YESNO) = idYes then
495 >    begin
496 >      DeleteFile(target);
497 >    end;
498 >  end;
499 >
500 >
501  
502   begin
503 < {  if CreateDataConnection(Source, ODB_Dat) = nil then
503 >
504 >  //
505 >  // FILE EXISTS CHECK FÜR DAT/RAW/SEP!!!
506 >  //
507 >
508 >  TimeFormat.ShortTimeFormat := 'hh:nn:ss';
509 >  TimeFormat.LongTimeFormat  := 'hh:nn:ss';
510 >  TimeFormat.TimeSeparator   := ':';
511 >
512 >  ConID := ConManager.OpenConnection(Source, ConRepMsg);
513 >  if not (ConRepMsg in [SM_OK, SM_AlreadyOpened]) then
514    begin
515 <    ShowMessage('Could not connect to .dat-file');
515 >    ShowMessage('Source-file couldn''t be opened! Aborting' + CrLf + GetOpenMsg(ConRepMsg));
516      Exit;
517 <  end
518 <  else
517 >  end else
518 >    Connection := ConManager.Connection[ConID];
519 >
520 >  ConID := ConManager.FileOpened(Target);
521 >  if ConID >= 0 then
522    begin
523 <    TOniDataDat(OniDataConnection).UnloadWhenUnused := False;
523 >    if MessageBox(Self.Handle, PChar('Destination-file is opened, close it in ' +
524 >          'order to proceed conversion?'), PChar('Destination-file opened'),
525 >          MB_YESNO + MB_ICONQUESTION) = ID_YES then
526 >    begin
527 >      if Form_Main.CheckConnectionCloseable(ConID) then
528 >        if not ConManager.CloseConnection(ConID, ConRepMsg) then
529 >        begin
530 >          ShowMessage('Couldn''t close destination-file. Aborting');
531 >          Exit;
532 >        end;
533 >    end else begin
534 >      ShowMessage('Aborting');
535 >      Exit;
536 >    end;
537    end;
538  
539 <  timeformat.LongTimeFormat := 'hh:nn:ss';
540 <  timeformat.ShortTimeFormat := 'hh:nn:ss';
541 <  timeformat.TimeSeparator := ':';
539 >  if FileExists(Target) then
540 >  begin
541 >    if MessageBox(Self.Handle, PChar('Destination-file exists. ' +
542 >          'Overwrite it?'), PChar('Destination-file exists'),
543 >          MB_YESNO + MB_ICONWARNING) = ID_YES then
544 >    begin
545 >      if not DeleteFile(Target) then
546 >      begin
547 >        ShowMessage('Couldn''t delete file. Aborting');
548 >        Exit;
549 >      end;
550 >    end else begin
551 >      ShowMessage('Aborting');
552 >      Exit;
553 >    end;
554 >  end;
555  
556    Self.Visible := True;
557    Form_Main.Visible := False;
# Line 473 | Line 560 | begin
560    abort := False;
561    btn_abortok.Caption := '&Abort...';
562    btn_abortok.Default := False;
476 –  loaded_filename := target;
563  
564 <  absolutebegintime := Time;
564 >  BeginTime := Time;
565  
566    DataBase := TABSDatabase.Create(Self);
567 +  DataBase.MaxConnections := 1;
568 +  DataBase.PageSize := 8112;
569 +  DataBase.PageCountInExtent := 8;
570 +
571    DataBase.DatabaseName := 'OLDB';
572    DataBase.DatabaseFileName := target;
573    DataBase.CreateDatabase;
# Line 491 | Line 581 | begin
581    Query := TABSQuery.Create(Self);
582    Query.DatabaseName := 'OLDB';
583    Query.SQL.Text :=
584 <    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), value STRING(128) );';
584 >    'CREATE TABLE globals  ( id AUTOINC PRIMARY KEY, name STRING(128), ' +
585 >    'value STRING(128) );';
586    Query.ExecSQL;
587    Query.SQL.Text :=
588 <    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, target_id INTEGER );';
588 >    'CREATE TABLE linkmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, ' +
589 >    'src_link_offset INTEGER, target_id INTEGER);';
590 >  Query.ExecSQL;
591 >  Query.SQL.Text := 'CREATE INDEX idsrcid ON linkmap (src_id);';
592 >  Query.ExecSQL;
593 >  Query.SQL.Text := 'CREATE INDEX idtargetid ON linkmap (target_id);';
594    Query.ExecSQL;
595    Query.SQL.Text :=
596 <    '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 );';
596 >    'CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, name STRING(32), src_id INTEGER, ' +
597 >    'src_link_offset INTEGER, sep BOOLEAN, type STRING(8), size INTEGER, ' +
598 >    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib);';
599    //    Query.SQL.Text:='CREATE TABLE rawmap  ( id AUTOINC PRIMARY KEY, src_id INTEGER, src_link_offset INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
600    Query.ExecSQL;
601 <  Query.SQL.Text :=
602 <    '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 );';
603 <  //    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
601 >  Query.SQL.Text := 'CREATE INDEX idsrcid ON rawmap (src_id);';
602 >  Query.ExecSQL;
603 >  Query.SQL.Text := 'CREATE INDEX idtype ON rawmap (type);';
604    Query.ExecSQL;
605    Query.SQL.Text :=
606 <    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
606 >    'CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), ' +
607 >    'name STRING(128), contenttype INTEGER, size INTEGER, ' +
608 >    'data BLOB BlobCompressionMode 9 BlobBlockSize 1024 BlobCompressionAlgorithm ZLib );';
609 >  //    Query.SQL.Text:='CREATE TABLE datfiles  ( id INTEGER PRIMARY KEY, extension CHAR(4), name STRING(128), contenttype INTEGER, size INTEGER, data BLOB BlobCompressionAlgorithm None );';
610    Query.ExecSQL;
611 + //  Query.SQL.Text :=
612 + //    'CREATE TABLE extlist  ( id AUTOINC PRIMARY KEY, ext CHAR(4), ident CHAR(16) );';
613 + //  Query.ExecSQL;
614  
615    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("dbversion","' +
616      dbversion + '");';
617    Query.ExecSQL;
618 <  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;
618 >
619    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("lvl","' +
620 <    IntToStr(OniDataConnection.LevelInfo.LevelNumber) + '");';
522 <  Query.ExecSQL;
523 <  if OniDataConnection.OSisMAC then
524 <    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","MAC");'
525 <  else
526 <    Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","PC");';
620 >    IntToStr(Connection.LevelNumber) + '");';
621    Query.ExecSQL;
622 <
623 <  DoStep('Writing extensionslist');
624 <  progress.Max := Length(OniDataConnection.GetExtensionsList);
625 <  Application.ProcessMessages;
626 <
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;
622 >  case Connection.DataOS of
623 >    DOS_WIN: temps := 'WIN';
624 >    DOS_WINDEMO: temps := 'WINDEMO';
625 >    DOS_MAC: temps := 'MAC';
626 >    DOS_MACBETA: temps := 'MACBETA';
627    end;
628 <  lbl_progress.Caption := '';
628 >  Query.SQL.Text := 'INSERT INTO globals (name,value) VALUES ("os","' + temps + '");';
629 >  Query.ExecSQL;
630  
631    progress.Position      := 0;
632    lbl_progress.Caption   := 'Files done: ' + IntToStr(0) + '/' + IntToStr(
633 <    OniDataConnection.GetFilesCount);
633 >    Connection.GetFileCount);
634    lbl_estimation.Caption := 'Estimated finishing time: unknown';
635  
636 <  DoStep('Loading .dat into memory');
563 <  Application.ProcessMessages;
564 <
565 <  progress.Max := OniDataConnection.GetFilesCount;
636 >  progress.Max := Connection.GetFileCount;
637    begintime    := Time;
638    DoStep('Writing .dat-fileslist');
639    Application.ProcessMessages;
640  
641 +  TAccess_OniArchive(Connection).UnloadWhenUnused := False;
642 +
643 +  FileTime := Time;
644    Database.StartTransaction;
645 <  for i := 0 to OniDataConnection.GetFilesCount - 1 do
645 >  for FileID := 0 to Connection.GetFileCount - 1 do
646    begin
647 <    fileinfo := OniDataConnection.GetFileInfo(i);
647 >    fileinfo := Connection.GetFileInfo(FileID);
648      if (fileinfo.FileType and $02) = 0 then
649      begin
650        mimecoder := TStringFormat_MIME64.Create;
651 <      Data      := OniDataConnection.LoadDatFile(i);
651 >      Connection.LoadDatFile(FileID, tempdata);
652        Query.SQL.Text :=
653          'INSERT INTO datfiles (id,extension,name,contenttype,size,data) VALUES (' +
654 <        IntToStr(i) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
654 >        IntToStr(FileID) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
655          fileinfo.FileType, 8) + '",' + IntToStr(fileinfo.Size) + ',MimeToBin("' +
656 <        MimeCoder.StrTo(@Data[0], Length(Data)) + '") );';
656 >        MimeCoder.StrTo(@tempdata[0], Length(tempdata)) + '") );';
657        Query.ExecSQL;
658        mimecoder.Free;
659  
660 <      rawlist := OniDataConnection.GetRawList(i);
661 <      if Length(rawlist) > 0 then
660 >      RawLinks := Connection.GetRawList(FileID);
661 >      if Length(RawLinks) > 0 then
662        begin
663 <        for j := 0 to High(rawlist) do
663 >        for i := 0 to High(RawLinks) do
664          begin
665 <          if rawlist[j].raw_size > 0 then
665 >          if RawLinks[i].RawSize > 0 then
666            begin
667 <            SetLength(Data, rawlist[j].raw_size);
668 <            OniDataConnection.LoadRawFile(i, rawlist[j].src_offset, Data);
667 >            SetLength(tempdata, RawLinks[i].RawSize);
668 >            Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, tempdata);
669              mimecoder      := TStringFormat_MIME64.Create;
670              Query.SQL.Text :=
671 <              'INSERT INTO rawmap (src_id,src_link_offset,sep,size,data) VALUES (' +
672 <              IntToStr(i) + ',' + IntToStr(rawlist[j].src_offset) + ',' + BoolToStr(
673 <              rawlist[j].loc_sep) + ',' + IntToStr(rawlist[j].raw_size) + ',MimeToBin("' +
674 <              MimeCoder.StrTo(@Data[0], rawlist[j].raw_size) + '") );';
671 >              'INSERT INTO rawmap (name,src_id,src_link_offset,sep,type,size,data) VALUES (' +
672 >              '"' + RawLinks[i].Name + '", ' +
673 >              IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ',' +
674 >              BoolToStr(RawLinks[i].LocSep) + ', ' +
675 >              '"' + RawLinks[i].RawType + '", ' +
676 >              IntToStr(RawLinks[i].RawSize) + ', ' +
677 >              'MimeToBin("' + MimeCoder.StrTo(@tempdata[0], RawLinks[i].RawSize) + '") );';
678              Query.ExecSQL;
679              mimecoder.Free;
680            end
681            else
682            begin
683              Query.SQL.Text :=
684 <              'INSERT INTO rawmap (src_id,src_link_offset,sep,size) VALUES (' +
685 <              IntToStr(i) + ',' + IntToStr(rawlist[j].src_offset) + ',' + BoolToStr(rawlist[j].loc_sep) + ',0);';
684 >              'INSERT INTO rawmap (name,src_id,src_link_offset,sep,type,size) VALUES (' +
685 >              '"' + RawLinks[i].Name + '", ' +
686 >              IntToStr(FileID) + ', ' + IntToStr(RawLinks[i].SrcOffset) + ', ' +
687 >              BoolToStr(RawLinks[i].LocSep) + ', ' +
688 >              '"' + RawLinks[i].RawType + '", ' +
689 >              '0);';
690              Query.ExecSQL;
691            end;
692          end;
693        end;
694  
695 <      HandleFile(fileinfo.Extension, i, True);
695 >      DatLinks := Connection.GetDatLinks(FileID);
696 >      if Length(DatLinks) > 0 then
697 >      begin
698 >        for i := 0 to High(DatLinks) do
699 >        begin
700 >          Query.SQL.Text :=
701 >            'INSERT INTO linkmap (src_id, src_link_offset, target_id) VALUES (' +
702 >            IntToStr(FileID) + ', ' + IntToStr(DatLinks[i].SrcOffset) + ', ' +
703 >            IntToStr(DatLinks[i].DestID) + ');';
704 >          Query.ExecSQL;
705 >        end;
706 >      end;
707      end
708      else
709      begin
710        Query.SQL.Text :=
711          'INSERT INTO datfiles (id,extension,name,contenttype,size) VALUES (' +
712 <        IntToStr(i) + ',"' + fileinfo.Extension + '","' + fileinfo.Name + '","' + IntToHex(
713 <        fileinfo.FileType, 8) + '",0);';
712 >        IntToStr(FileID) + ', "' + fileinfo.Extension + '", ' +
713 >        '"' + fileinfo.Name + '", "' + IntToHex(fileinfo.FileType, 8) + '", 0);';
714        Query.ExecSQL;
715      end;
716 <    if ((i mod 100) = 0) and (i > 0) then
716 >    if ((FileID mod 100) = 0) and (FileID > 0) then
717      begin
718        Database.Commit(False);
719        Database.StartTransaction;
720      end;
721 <    if ((i mod 10) = 0) and (i >= 100) then
721 >    if ((FileID mod 10) = 0) and (FileID >= 100) then
722        lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
723 <        (Time - begintime) / i * (progress.Max - i + 1) * 1.1, timeformat );
724 <    progress.Position := i;
725 <    lbl_progress.Caption := 'Files done: ' + IntToStr(i) + '/' + IntToStr(progress.Max);
723 >        (Time - FileTime) / FileID * (progress.Max - FileID + 1) * 1.1, timeformat );
724 >    progress.Position := FileID;
725 >    lbl_progress.Caption := 'Files done: ' + IntToStr(FileID) + '/' + IntToStr(progress.Max);
726      Application.ProcessMessages;
727      if abort then
728      begin
729 <      stop_convert;
729 >      StopConvert;
730        Exit;
731      end;
732    end;
# Line 643 | Line 735 | begin
735    lbl_progress.Caption   := 'Files done: ' + IntToStr(progress.Max) + '/' +
736      IntToStr(progress.Max);
737  
738 <  lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - absolutebegintime, timeformat) + ')';
738 >  lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - BeginTime, timeformat) + ')';
739  
740    DoStep('FIN');
741    btn_abortok.Caption := '&OK';
742    btn_abortok.Default := True;
743  
744    converting := False;
745 +  TAccess_OniArchive(Connection).UnloadWhenUnused := True;
746  
747 <  database.Close;
748 <  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)';
747 >  Query.Close;
748 >  Query.Free;
749    DataBase.Close;
750 <  if MessageBox(Self.Handle, PChar('Delete the unfinished DB-file?'),
751 <    PChar('Delete file?'), MB_YESNO) = idYes then
674 <  begin
675 <    DeleteFile(loaded_filename);
676 <  end;
677 < }end;
750 >  DataBase.Free;
751 > end;
752  
753  
754  
# Line 696 | Line 770 | begin
770   end;
771  
772  
773 <
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.
773 > end.

Diff Legend

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