ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/Helper/LevelDB.pas

Comparing:
oup/rewrite/Helper/Helper_LevelDB.pas (file contents), Revision 97 by alloc, Mon Jan 22 23:05:45 2007 UTC vs.
oup/current/Helper/LevelDB.pas (file contents), Revision 129 by alloc, Wed Mar 28 01:12:22 2007 UTC

#	Line 1 | Line 1
1	<	unit Helper_LevelDB;
2	<
1	>	unit LevelDB;
2		interface
4	–
3		uses
4		Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
5		Dialogs, ComCtrls, StdCtrls, StrUtils;
#	Line 15 | Line 13 | type
13		lbl_estimation: TLabel;
14		procedure btn_abortokClick(Sender: TObject);
15		private
16	<	procedure HandleFile(ext: String; fileid: Integer; dir_dat2db: Boolean);
17	<	procedure stop_convert;
16	>	procedure HandleFile(Ext: String; FileID: Integer);
17	>	procedure StopConvert;
18		public
19		procedure CreateDatabase(Source, Target: String);
20		procedure CreateLevel(Source, Target: String);
#	Line 27 | Line 25 | var
25		Form_LevelDB: TForm_LevelDB;
26
27		implementation
30	–
28		{$R *.dfm}
29	<
30	<	uses ABSMain, ABSDecUtil, Main, Functions, Data, OniImgClass, DataStructures, ConnectionManager;
29	>	uses ABSMain, ABSDecUtil, Main,
30	>	ConnectionManager, TypeDefs, DataAccess, OniImgClass, Data;
31
32		type
33	<	THandler = procedure(fileid: LongWord; dir_dat2db: Boolean);
34	<
38	<	TConvertHandlers = record
33	>	THandler = procedure(FileID: Integer);
34	>	TConvertHandler = record
35		Ext:     String[4];
40	–	needed:  Boolean;
36		Handler: THandler;
37		end;
38
39		var
40	<	ConvertHandlers: array of TConvertHandlers;
41	<	loaded_filename: String;
42	<	converting: Boolean = False;
43	<	abort:     Boolean = False;
49	<	DataBase:  TABSDatabase;
50	<	Query:     TABSQuery;
51	<	MimeCoder: TStringFormat_MIME64;
52	<
53	<	var
54	<	DatHeader:   THeader;
55	<	FilesHeader: TFilesMap;
56	<	NamedFilesHeader: TNamedFilesMap;
57	<	ExtensionsHeader: TExtensionsMap;
58	<	Stream_Body, Stream_Names: TMemoryStream;
59	<	Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
60	<	OniDataConnection: TOniData;
40	>	ConvertHandlers: array of TConvertHandler;
41	>	//  loaded_filename: String;
42	>	Converting:  Boolean = False;
43	>	Abort:       Boolean = False;
44
45
46	+	function GetOpenMsg(msg: TStatusMessages): String;
47	+	begin
48	+	case msg of
49	+	SM_AlreadyOpened:    Result := 'File already opened.';
50	+	SM_FileNotFound:     Result := 'File not found.';
51	+	SM_UnknownExtension: Result := 'Unknown extension.';
52	+	SM_IncompatibleFile: Result := 'Incompatible file format.';
53	+	SM_UnknownError:     Result := 'Unknown error.';
54	+	end;
55	+	end;
56
57
58	<	procedure TForm_LevelDB.CreateLevel(Source, target: String);
58	>	procedure TForm_LevelDB.CreateLevel(Source, Target: String);
59		var
60	<	files: LongWord;
61	<
62	<	i, j:     LongWord;
63	<	temps, temps2: String;
71	<	Data, rawdata: Tdata;
72	<	absolutebegintime, begintime: Double;
73	<	step:     Byte;
74	<	rawlist:  TRawList;
75	<	extlist:  TExtensionsMap;
76	<	fileinfo: TFileInfo;
77	<	datlinks: TDatLinks;
78	<	OniImage: TOniImage;
79	<	levelid:  LongWord;
80	<	timeformat: TFormatSettings;
60	>	DatHeader:        THeader;
61	>	FilesHeader:      TFilesMap;
62	>	NamedFilesHeader: TNamedFilesMap;
63	>	ExtensionsHeader: TExtensionsMap;
64
65	<	conIndex: Integer;
66	<	connection: TOniData;
84	<	const
85	<	steps: Byte = 3;
65	>	Stream_Body, Stream_Names:          TMemoryStream;
66	>	Stream_Dat, Stream_Raw, Stream_Sep: TFileStream;
67
68	+	//  Data, rawdata: Tdata;
69	+	BeginTime, FileTime: Double;
70	+	Step:     Integer;
71	+	//  rawlist:  TRawDataList;
72	+	//  datlinks: TDatLinks;
73	+	OniImage:   TOniImage;
74	+	LevelID:    Integer;
75	+	TimeFormat: TFormatSettings;
76	+
77	+	ConID:      Integer;
78	+	Connection: TDataAccess;
79	+	ConRepMsg:  TStatusMessages;
80	+
81	+	FileID:     Integer;
82	+
83	+	Strings:    TStrings;
84	+	i, j:       Integer;
85	+	temps:      String;
86	+	tempi:      Integer;
87	+	tempb:      Byte;
88	+	FileInfo:   TFileInfo;
89	+	DatLinks:   TDatLinkList;
90	+	RawLinks:   TRawDataList;
91
92	+	DatFileStream, RawFileStream: TMemoryStream;
93	+	const
94	+	Steps: Byte = 3;
95
96
97	<	procedure DoStep(stepname: String);
97	>	procedure DoStep(StepName: String);
98		begin
99	<	Inc(step);
100	<	if stepname <> 'FIN' then
99	>	Inc(Step);
100	>	if StepName <> 'FIN' then
101		group_progress.Caption :=
102	<	'Creating Dat (Step ' + IntToStr(step) + '/' + IntToStr(steps) + ': ' + stepname + ')'
102	>	'Creating Dat (Step ' + IntToStr(Step) + '/' + IntToStr(Steps) + ': ' + StepName + ')'
103		else
104		group_progress.Caption := 'Creating Dat (FINISHED)';
105		end;
#	Line 103 | Line 110 | begin
110		// FILE EXISTS CHECK FÜR DAT/RAW/SEP!!!
111		//
112
113	<	timeformat.ShortTimeFormat := 'hh:nn:ss';
114	<	timeformat.LongTimeFormat := 'hh:nn:ss';
115	<	timeformat.TimeSeparator := ':';
113	>	TimeFormat.ShortTimeFormat := 'hh:nn:ss';
114	>	TimeFormat.LongTimeFormat  := 'hh:nn:ss';
115	>	TimeFormat.TimeSeparator   := ':';
116
117	<	connection := ConnectionExists(target);
118	<	if connection <> nil then
117	>	ConID := ConManager.OpenConnection(Source, ConRepMsg);
118	>	if not (ConRepMsg in [SM_OK, SM_AlreadyOpened]) then
119		begin
120	<	ShowMessage('Destination-file is opened, close it in order to proceed conversion?');
120	>	ShowMessage('Source-file couldn''t be opened! Aborting' + CrLf + GetOpenMsg(ConRepMsg));
121		Exit;
122	<	end;
122	>	end else
123	>	Connection := ConManager.Connection[ConID];
124
125	<	connection := ConnectionExists(source);
126	<	if connection <> nil then
125	>	ConID := ConManager.FileOpened(Target);
126	>	if ConID >= 0 then
127		begin
128	<	ShowMessage('Source-file is opened, close it in order to proceed conversion?');
129	<	Exit;
128	>	if MessageBox(Self.Handle, PChar('Destination-file is opened, close it in ' +
129	>	'order to proceed conversion?'), PChar('Destination-file opened'),
130	>	MB_YESNO + MB_ICONQUESTION) = ID_YES then
131	>	begin
132	>	if Form_Main.CheckConnectionCloseable(ConID) then
133	>	if not ConManager.CloseConnection(ConID, ConRepMsg) then
134	>	begin
135	>	ShowMessage('Couldn''t close destination-file. Aborting');
136	>	Exit;
137	>	end;
138	>	end else begin
139	>	ShowMessage('Aborting');
140	>	Exit;
141	>	end;
142		end;
143
144	<
125	<	if CreateDataConnection(Source, ODB_ADB) = nil then
144	>	if FileExists(Target) then
145		begin
146	<	ShowMessage('Could not connect to .oldb-file');
147	<	Exit;
146	>	if MessageBox(Self.Handle, PChar('Destination-file exists. ' +
147	>	'Overwrite it?'), PChar('Destination-file exists'),
148	>	MB_YESNO + MB_ICONWARNING) = ID_YES then
149	>	begin
150	>	if not DeleteFile(Target) then
151	>	begin
152	>	ShowMessage('Couldn''t delete file. Aborting');
153	>	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;
162	>	end;
163	>	end else begin
164	>	ShowMessage('Aborting');
165	>	Exit;
166	>	end;
167		end;
130	–	levelid  := OniDataConnection.LevelInfo.LevelNumber;
131	–	levelid  := (levelid * 2) * 256 * 256 * 256 + $01;
132	–	OniImage := TOniImage.Create;
168
169	<	absolutebegintime := Time;
169	>	LevelID  := Connection.LevelNumber;
170	>	LevelID  := (LevelID * 2) * 256 * 256 * 256 + $01;
171	>	OniImage := TOniImage.Create;
172
173		Self.Visible := True;
174		Form_Main.Visible := False;
175	<	step  := 0;
176	<	converting := True;
177	<	abort := False;
175	>	Step := 0;
176	>	Converting := True;
177	>	Abort := False;
178		btn_abortok.Caption := '&Abort...';
179		btn_abortok.Default := False;
180	<	absolutebegintime := Time;
180	>	BeginTime := Time;
181
182		Stream_Body  := TMemoryStream.Create;
183		Stream_Names := TMemoryStream.Create;
184	<	Stream_Dat   := TFileStream.Create(target, fmCreate);
185	<	Stream_Raw   := TFileStream.Create(AnsiReplaceStr(target, '.dat', '.raw'), fmCreate);
186	<	if OniDataConnection.OSisMac then
187	<	Stream_Sep := TFileStream.Create(AnsiReplaceStr(target, '.dat', '.sep'), fmCreate);
184	>	Stream_Dat   := TFileStream.Create(Target, fmCreate);
185	>	Stream_Raw   := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.raw'), fmCreate);
186	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
187	>	Stream_Sep := TFileStream.Create(AnsiReplaceStr(Target, '.dat', '.sep'), fmCreate);
188
189		DoStep('Creating header');
190		progress.Position      := 0;
#	Line 155 | Line 192 | begin
192		lbl_estimation.Caption := 'Estimated finishing time: unknown';
193		Application.ProcessMessages;
194
195	<	NamedFilesHeader := TOniDataADB(OniDataConnection).GetNamedFilesMap;
196	<	extlist := OniDataConnection.GetExtendedExtensionsList;
197	<	for i := 0 to High(DatHeader.Ident) do
198	<	DatHeader.Ident[i] := OniDataConnection.LevelInfo.Ident[i];
199	<	DatHeader.Files := OniDataConnection.GetFilesCount;
195	>	SetLength(NamedFilesHeader, 0);
196	>	Strings := TStringList.Create;
197	>	Strings := Connection.GetFilesList('', '', False, ST_ExtNameAsc);
198	>	for i := 0 to Strings.Count - 1 do
199	>	begin
200	>	if MidStr(Strings.Strings[i],
201	>	Pos('-', Strings.Strings[i]) + 1,
202	>	Length(Strings.Strings[i]) -
203	>	Pos('.', ReverseString(Strings.Strings[i])) -
204	>	Pos('-', Strings.Strings[i])
205	>	) <> '' then
206	>	begin
207	>	SetLength(NamedFilesHeader, Length(NamedFilesHeader) + 1);
208	>	NamedFilesHeader[High(NamedFilesHeader)].FileNumber := StrToInt(MidStr(Strings.Strings[i], 1, 5));
209	>	NamedFilesHeader[High(NamedFilesHeader)].blubb := 0;
210	>	end;
211	>	end;
212	>
213	>	for i := 0 to High(DatHeader.OSIdent) do
214	>	case Connection.DataOS of
215	>	DOS_WIN: DatHeader.OSIdent[i] := HeaderOSIdentWin[i];
216	>	DOS_MAC: DatHeader.OSIdent[i] := HeaderOSIdentMac[i];
217	>	DOS_MACBETA: DatHeader.OSIdent[i] := HeaderOSIdentMacBeta[i];
218	>	end;
219	>	for i := 0 to High(DatHeader.GlobalIdent) do
220	>	DatHeader.GlobalIdent[i] := HeaderGlobalIdent[i];
221	>	DatHeader.Files := Connection.GetFileCount;
222		DatHeader.NamedFiles := Length(NamedFilesHeader);
223	<	DatHeader.Extensions := Length(extlist);
223	>
224	>	Strings := Connection.GetExtensionsList(EF_ExtCount);
225	>
226	>	DatHeader.Extensions := Strings.Count;
227		DatHeader.DataAddr   := 0;
228		DatHeader.DataSize   := 0;
229		DatHeader.NamesAddr  := 0;
#	Line 171 | Line 233 | begin
233		SetLength(FilesHeader, DatHeader.Files);
234		SetLength(ExtensionsHeader, DatHeader.Extensions);
235
236	+
237		DoStep('Writing extensions-header');
238	<	progress.Max := Length(OniDataConnection.GetExtensionsList);
238	>	progress.Max := Strings.Count;
239		Application.ProcessMessages;
240	<
178	<	for i := 0 to High(ExtensionsHeader) do
240	>	for i := 0 to Strings.Count - 1 do
241		begin
242	<	ExtensionsHeader[i].Ident     := extlist[i].Ident;
243	<	ExtensionsHeader[i].Extension := extlist[i].Extension;
244	<	SetLength(temps, 4);
242	>	temps := Strings.Strings[i];
243	>	ExtensionsHeader[i].ExtCount := StrToInt( MidStr(
244	>	temps,
245	>	Pos('(', temps) + 1,
246	>	Pos(')', temps) - Pos('(', temps) - 1 ) );
247	>	temps := MidStr(temps, 1, 4);
248		for j := 0 to 3 do
249	<	temps[j + 1] := ExtensionsHeader[i].Extension[3 - j];
250	<	ExtensionsHeader[i].ExtCount :=
251	<	Length(OniDataConnection.GetFilesList(temps, '', False, stIDAsc));
249	>	ExtensionsHeader[i].Extension[j] := temps[4-j];
250	>	for j := 0 to High(FileTypes) do
251	>	if FileTypes[j].Extension = temps then
252	>	Break;
253	>	if j < Length(FileTypes) then
254	>	begin
255	>	case Connection.DataOS of
256	>	DOS_WIN:     ExtensionsHeader[i].Ident := FileTypes[j].IdentWin;
257	>	DOS_WINDEMO: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
258	>	DOS_MAC:     ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
259	>	DOS_MACBETA: ExtensionsHeader[i].Ident := FileTypes[j].IdentMac;
260	>	end;
261	>	end else begin
262	>	ShowMessage('Unknown Extension: ' + Strings.Strings[i]);
263	>	Exit;
264	>	end;
265		progress.Position    := i + 1;
266		lbl_progress.Caption := 'Extensions done: ' + IntToStr(i + 1) + '/' +
267	<	IntToStr(Length(extlist));
267	>	IntToStr(Strings.Count);
268		Application.ProcessMessages;
269		end;
270
#	Line 197 | Line 275 | begin
275		lbl_estimation.Caption := 'Estimated finishing time: unknown';
276		Application.ProcessMessages;
277
278	<	begintime := Time;
279	<	for i := 0 to DatHeader.Files - 1 do
278	>	FileTime := Time;
279	>	for FileID := 0 to DatHeader.Files - 1 do
280		begin
281	<	fileinfo := OniDataConnection.GetFileInfo(i);
281	>	FileInfo := Connection.GetFileInfo(FileID);
282		for j := 0 to 3 do
283	<	FilesHeader[i].Extension[j] := fileinfo.Extension[4 - j];
284	<	if fileinfo.Size > 0 then
283	>	FilesHeader[FileID].Extension[j] := FileInfo.Extension[4 - j];
284	>	if FileInfo.Size > 0 then
285		begin
286	<	//        DatLinks:=;
287	<	FilesHeader[i].DataAddr := Stream_Body.Size + 8;
288	<	Data    := OniDataConnection.LoadDatFile(i);
289	<	Data[4] := (levelid) and $FF;
290	<	Data[5] := (levelid shr 8) and $FF;
291	<	Data[6] := (levelid shr 16) and $FF;
292	<	Data[7] := (levelid shr 24) and $FF;
286	>	FilesHeader[FileID].DataAddr := Stream_Body.Size + 8;
287	>	DatFileStream := TMemoryStream.Create;
288	>	Connection.LoadDatFile(FileID, TStream(DatFileStream));
289	>	DatFileStream.Seek(4, soFromBeginning);
290	>	DatFileStream.Write(LevelID, 4);
291	>
292	>	DatLinks := Connection.GetDatLinks(FileID);
293	>	if Length(DatLinks) > 0 then
294	>	begin
295	>	for i := 0 to High(DatLinks) do
296	>	begin
297	>	DatFileStream.Seek(DatLinks[i].SrcOffset, soFromBeginning);
298	>	if DatLinks[i].DestID < 0 then
299	>	tempi := 0
300	>	else
301	>	tempi := DatLinks[i].DestID * 256 + 1;
302	>	DatFileStream.Write(tempi, 4);
303	>	end;
304	>	end;
305
306	<	if (Pos(UpperCase(fileinfo.Extension), UpperCase(raws)) mod 4) = 1 then
306	>	RawLinks := Connection.GetRawList(FileID);
307	>	if Length(RawLinks) > 0 then
308		begin
309	<	rawlist := OniDataConnection.GetRawList(i);
219	<	if Length(rawlist) > 0 then
309	>	for i := 0 to High(RawLinks) do
310		begin
311	<	for j := 0 to High(rawlist) do
311	>	if RawLinks[i].RawSize > 0 then
312		begin
313	<	if rawlist[j].raw_size > 0 then
313	>	RawFileStream := TMemoryStream.Create;
314	>	Connection.LoadRawFile(FileID, RawLinks[i].SrcOffset, TStream(RawFileStream));
315	>	RawFileStream.Seek(0, soFromBeginning);
316	>	if RawLinks[i].LocSep then
317		begin
318	<	if (UpperCase(fileinfo.Extension) = 'TXMP') and
319	<	((Data[$88] and $01) > 0) then
320	<	begin
321	<	OniImage.LoadFromTXMP(Connection, i);
322	<	OniImage.GetMipMappedImage(rawdata);
323	<	rawlist[j].raw_size := OniImage.GetImageDataSize(True);
324	<	Data[$90] := $08;
325	<	Data[$89] := 32;
326	<	{                  if data[$90]<>OniImage.StoreType then begin
327	<	data[$90]:=OniImage.StoreType;
235	<	data[$89]:=(data[$89] and $CF) or $20;
236	<	end;
237	<	}                end
238	<	else
239	<	begin
240	<	SetLength(rawdata, rawlist[j].raw_size);
241	<	OniDataConnection.LoadRawFile(i, rawlist[j].src_offset, @rawdata[0]);
242	<	end;
243	<	//                data[$88]:=data[$88] and $FE;
244	<
245	<	if rawlist[j].loc_sep then
246	<	begin
247	<	rawlist[j].raw_addr := Stream_Sep.Size;
248	<	Stream_Sep.Write(rawdata[0], Length(rawdata));
249	<	end
250	<	else
251	<	begin
252	<	rawlist[j].raw_addr := Stream_Raw.Size;
253	<	Stream_Raw.Write(rawdata[0], Length(rawdata));
254	<	end;
255	<	end
256	<	else
257	<	rawlist[j].raw_addr := 0;
258	<	Data[rawlist[j].src_offset + 0] := (rawlist[j].raw_addr) and $FF;
259	<	Data[rawlist[j].src_offset + 1] := (rawlist[j].raw_addr shr 8) and $FF;
260	<	Data[rawlist[j].src_offset + 2] := (rawlist[j].raw_addr shr 16) and $FF;
261	<	Data[rawlist[j].src_offset + 3] := (rawlist[j].raw_addr shr 24) and $FF;
262	<	end;
318	>	RawLinks[i].RawAddr := Stream_Sep.Size;
319	>	Stream_sep.CopyFrom(RawFileStream, RawFileStream.Size);
320	>	end else begin
321	>	RawLinks[i].RawAddr := Stream_Raw.Size;
322	>	Stream_Raw.CopyFrom(RawFileStream, RawFileStream.Size);
323	>	end;
324	>	end else
325	>	RawLinks[i].RawAddr := 0;
326	>	DatFileStream.Seek(RawLinks[i].SrcOffset, soFromBeginning);
327	>	DatFileStream.Write(RawLinks[i].RawAddr, 4);
328		end;
329		end;
330	<
331	<	Stream_Body.Write(Data[0], Length(Data));
267	<	//
330	>	DatFileStream.Seek(0, soFromBeginning);
331	>	Stream_Body.CopyFrom(DatFileStream, DatFileStream.Size);
332		end
333		else
334		FilesHeader[i].DataAddr := 0;
#	Line 281 | Line 345 | begin
345
346		if ((i mod 10) = 0) and (i >= 100) then
347		lbl_estimation.Caption := 'Estimated time left: ' + TimeToStr(
348	<	(Time - begintime) / i * (progress.Max - i + 1) * 1.1, timeformat );
348	>	(Time - FileTime) / i * (progress.Max - i + 1) * 1.1, TimeFormat );
349		progress.Position := i + 1;
350		lbl_progress.Caption := 'Files done: ' + IntToStr(i + 1) + '/' + IntToStr(progress.Max);
351		Application.ProcessMessages;
#	Line 311 | Line 375 | begin
375		Stream_Body.Free;
376		Stream_Names.Free;
377		Stream_Raw.Free;
378	<	if OniDataConnection.OSisMac then
378	>
379	>	if Connection.DataOS in [DOS_WINDEMO, DOS_MAC, DOS_MACBETA] then
380		Stream_Sep.Free;
381
382		progress.Position      := progress.Max;
383		lbl_progress.Caption   := 'Files done: ' + IntToStr(progress.Max) + '/' +
384		IntToStr(progress.Max);
385	<	lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - absolutebegintime, timeformat) + ')';
385	>	lbl_estimation.Caption := 'FINISHED (duration: ' + TimeToStr(Time - Begintime, TimeFormat) + ')';
386
387		DoStep('FIN');
388		btn_abortok.Caption := '&OK';
#	Line 327 | Line 392 | begin
392
393		converting := False;
394
395	<	CloseDataConnection(DataConnections[conIndex]);
395	>	//  CloseDataConnection(DataConnections[conIndex]);
396		end;
397
398
#	Line 337 | Line 402 | procedure TForm_LevelDB.HandleFile;
402		var
403		i: Byte;
404		begin
405	<	for i := 1 to Length(ConvertHandlers) do
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
#	Line 346 | Line 411 | begin
411		end
412		else
413		Break;
414	<	end;
414	>	}end;
415
416
417
418
419		procedure TForm_LevelDB.CreateDatabase(Source, target: String);
420	+	{
421		var
422	+	DataBase:    TABSDatabase;
423	+	Query:       TABSQuery;
424	+	MimeCoder:   TStringFormat_MIME64;
425	+
426		i, j:     LongWord;
427		temps, temps2: String;
428		Data:     Tdata;
#	Line 379 | Line 449 | const
449		else
450		group_progress.Caption := 'Creating DB (FINISHED)';
451		end;
452	+	}
453
454		begin
455	<	if CreateDataConnection(Source, ODB_Dat) = nil then
455	>	{  if CreateDataConnection(Source, ODB_Dat) = nil then
456		begin
457		ShowMessage('Could not connect to .dat-file');
458		Exit;
#	Line 584 | Line 655 | begin
655		database.Free;
656
657		CloseDataConnection(DataConnections[conIndex]);
658	+	}
659		end;
660
661
662
663
664	<	procedure TForm_LevelDB.stop_convert;
664	>	procedure TForm_LevelDB.StopConvert;
665		begin
666	<	btn_abortok.Caption := '&Close';
666	>	{  btn_abortok.Caption := '&Close';
667		btn_abortok.Default := True;
668		converting := False;
669		lbl_estimation.Caption := 'ABORTED';
#	Line 602 | Line 674 | begin
674		begin
675		DeleteFile(loaded_filename);
676		end;
677	<	end;
677	>	}end;
678
679
680
#	Line 625 | Line 697 | end;
697
698
699
700	<
700	>	{
701		procedure InsertDatLinkToDB(fileid: LongWord; offset: LongWord);
702		var
703		link: LongWord;
#	Line 1657 | Line 1729 | begin
1729		begin
1730		end;
1731		end;
1732	+	}
1733
1734
1735	<
1663	<
1735	>	{
1736		procedure InsertHandler(ext: String; needed: Boolean; handler: THandler);
1737		begin
1738		SetLength(ConvertHandlers, Length(ConvertHandlers) + 1);
#	Line 1668 | Line 1740 | begin
1740		ConvertHandlers[High(ConvertHandlers)].needed  := needed;
1741		ConvertHandlers[High(ConvertHandlers)].handler := handler;
1742		end;
1743	<
1743	>	}
1744		begin
1745	<	InsertHandler('ABNA', False, nil);
1745	>	{  InsertHandler('ABNA', False, nil);
1746		//  InsertHandler('AGDB',True,AGDB);
1747		InsertHandler('AGDB', False, nil);
1748		InsertHandler('AGQC', False, nil);
#	Line 1768 | Line 1840 | begin
1840		InsertHandler('WMM_', False, nil);
1841		InsertHandler('WMMB', True, WMMB);
1842		InsertHandler('WPGE', True, WPGE);
1843	<	end.
1843	>	}end.

Diff Legend

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