ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/oup/current/DataAccess/Access_OUP_ADB.pas

Comparing:
oup/rewrite/DataAccess/Access_OUP_ADB.pas (file contents), Revision 93 by alloc, Thu Jan 18 17:15:59 2007 UTC vs.
oup/current/DataAccess/Access_OUP_ADB.pas (file contents), Revision 113 by alloc, Sun Feb 25 17:20:22 2007 UTC

#	Line 1 | Line 1
1		unit Access_OUP_ADB;
2		interface
3
4	<	uses DataAccess;
4	>	uses DataAccess, ABSMain, TypeDefs, Classes;
5
6		type
7		TAccess_OUP_ADB = class(TDataAccess)
8		private
9	<	{    FDatabase: TABSDatabase;
10	<	FQuery:    TABSQuery;
11	<	Fdat_files:    TFiles;
9	>	FDatabase:          TABSDatabase;
10	>	FQuery:             TABSQuery;
11	>	Fdat_files:         TFiles;
12		Fdat_extensionsmap: TExtensionsMap;
13		protected
14		public
15	<	constructor Create(OLDBFilename: String; var Result: Boolean); override;
15	>	constructor Create(DBFilename: String; ConnectionID: Integer; var Msg: TStatusMessages); override;
16		procedure Close; override;
17
18		procedure UpdateListCache;
19	<	//      function GetDatLinks(srcid:LongWord):TDatLinks;
20	<	function GetFileInfo(fileid: Integer): TFileInfo; override;
21	<	function GetFilesList(ext: String; pattern: String;
22	<	NoEmptyFiles: Boolean; sort: TSortType): TStringArray; override;
23	<	function GetFilesCount: LongWord; override;
24	<	function GetExtensionsList: TStringArray; override;
25	<	function GetExtendedExtensionsList: TExtensionsMap; override;
26	<	function GetNamedFilesMap: TNamedFilesMap;
27	<
28	<	function LoadDatFile(fileid: LongWord): Tdata; override;
29	<	procedure UpdateDatFile(fileid: LongWord; Data: Tdata); override;
30	<	procedure LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
31	<	procedure UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer); override;
32	<
33	<	function GetRawList(fileid: LongWord): TRawList; override;
34	<	procedure LoadRawFile(fileid, dat_offset: LongWord; target: Pointer); override;
35	<	procedure UpdateRawFile(fileid, dat_offset: LongWord; size: LongWord;
36	<	target: Pointer); override;
37	<	procedure LoadRawFilePart(fileid, dat_offset: LongWord;
38	<	offset, size: LongWord; target: Pointer); override;
39	<	procedure UpdateRawFilePart(fileid, dat_offset: LongWord;
40	<	offset, size: LongWord; target: Pointer); override;
19	>
20	>	function GetLinksToFile(FileID: Integer): TLinks;
21	>	function GetLinksFromFile(FileID: Integer): TLinks;
22	>
23	>	function GetFileInfo(FileID: Integer): TFileInfo; override;
24	>	function GetFilesList(Ext: String; Pattern: String;
25	>	NoEmptyFiles: Boolean; SortType: TSortType): TStrings; override;
26	>	function GetFileCount: Integer; override;
27	>	function GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings; override;
28	>
29	>	procedure LoadDatFile(FileID: Integer; var Target: TStream); overload; override;
30	>	procedure UpdateDatFile(FileID: Integer; Src: TStream); overload; override;
31	>	procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream); overload; override;
32	>	procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; override;
33	>
34	>	function GetDatLinks(FileID: Integer): TDatLinkList; override;
35	>	function GetRawList(FileID: Integer): TRawDataList; override;
36	>	function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; override;
37	>
38	>	procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; override;
39	>	procedure UpdateRawFile(FileID, DatOffset: Integer; Src: TStream); overload; override;
40	>	procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; override;
41	>	procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; override;
42		published
43	<	}  end;
43	>	end;
44
45
46		implementation
47
48	+	uses
49	+	SysUtils, Data, Functions, ABSDecUtil, DB;
50	+
51
52		(*
53		================================================================================
54		Implementation of  TOniDataADB
55		*)
56
57	<	{
58	<	constructor TOniDataADB.Create(OLDBFilename: String; var Result: Boolean);
55	<	var
56	<	i, j:  Byte;
57	<	temps: String;
57	>
58	>	constructor TAccess_OUP_ADB.Create(DBFilename: String; ConnectionID: Integer; var Msg: TStatusMessages);
59		begin
60	<	if not FileExists(OLDBFilename) then
60	>	Msg := SM_UnknownError;
61	>	if not FileExists(DBFilename) then
62		begin
63	<	ShowMessage('File doesn''t exist!!!');
62	<	Result := False;
63	>	Msg := SM_FileNotFound;
64		Exit;
65		end;
66	<	FFileName := OLDBFilename;
66	>	FFileName := DBFilename;
67	>
68		FDatabase := TABSDatabase.Create(nil);
69	<	FDatabase.DatabaseName := 'OLDBcon';
70	<	FDatabase.DatabaseFileName := OLDBFilename;
69	>	FDatabase.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID);
70	>	FDatabase.DatabaseFileName := DBFilename;
71		FDatabase.Open;
72		FQuery := TABSQuery.Create(FDatabase);
73	<	FQuery.DatabaseName := 'OLDBcon';
73	>	FQuery.DatabaseName := 'OLDBcon' + IntToStr(ConnectionID);
74		FQuery.SQL.Text := 'SELECT [name],[value] FROM globals ORDER BY [name] ASC';
75		FQuery.Open;
76		FQuery.First;
#	Line 77 | Line 79 | begin
79		begin
80		if FQuery.FieldByName('value').AsString <> DBversion then
81		begin
82	<	ShowMessage('Database-file ' + #13 + #10 +
81	<	'"' + OLDBFilename + '"' + #13 + #10 +
82	<	'has wrong version. (Required: ' + DBversion + '; found: ' +
83	<	FQuery.FieldByName('value').AsString + ')');
82	>	Msg := SM_IncompatibleDBVersion;
83		FQuery.Close;
85	–	Result := False;
84		Exit;
85		end;
86		end;
87		if FQuery.FieldByName('name').AsString = 'lvl' then
88	+	FLevelNumber := StrToInt(FQuery.FieldByName('value').AsString);
89	+	if FQuery.FieldByName('name').AsString = 'DataOS' then
90		begin
91	<	FLevelInfo.LevelNumber := StrToInt(FQuery.FieldByName('value').AsString);
92	<	end;
93	<	if FQuery.FieldByName('name').AsString = 'ident' then
94	<	begin
95	<	temps := FQuery.FieldByName('value').AsString;
96	<	for i := 0 to High(FLevelInfo.Ident) do
97	<	begin
98	<	j := i * 2 + 1;
99	<	case temps[j] of
100	<	'0'..'9':
101	<	FLevelInfo.Ident[i] := Ord(temps[j]) - 48;
102	<	'A'..'F':
103	<	FLevelInfo.Ident[i] := Ord(temps[j]) - 55;
104	<	end;
105	<	FLevelInfo.Ident[i] := FLevelInfo.Ident[i] * 16;
106	<	case temps[j + 1] of
107	<	'0'..'9':
108	<	FLevelInfo.Ident[i] := FLevelInfo.Ident[i] + Ord(temps[j + 1]) - 48;
109	<	'A'..'F':
110	<	FLevelInfo.Ident[i] := FLevelInfo.Ident[i] + Ord(temps[j + 1]) - 55;
111	<	end;
112	<	end;
113	<	end;
114	<	if FQuery.FieldByName('name').AsString = 'ident' then
115	<	begin
116	<	temps   := FQuery.FieldByName('value').AsString;
117	<	Fos_mac := temps = 'MAC';
91	>	if FQuery.FieldByName('value').AsString = 'WIN' then
92	>	FDataOS := DOS_WIN
93	>	else if FQuery.FieldByName('value').AsString = 'WINDEMO' then
94	>	FDataOS := DOS_WINDEMO
95	>	else if FQuery.FieldByName('value').AsString = 'MAC' then
96	>	FDataOS := DOS_MAC
97	>	else if FQuery.FieldByName('value').AsString = 'MACBETA' then
98	>	FDataOS := DOS_MACBETA;
99		end;
100		FQuery.Next;
101		until FQuery.EOF;
102		FQuery.Close;
103
104	<	UpdateListCache;
104	>	Msg := SM_OK;
105	>	FBackend := DB_ADB;
106	>
107	>	FConnectionID := ConnectionID;
108	>	FChangeRights := [CR_EditDat, CR_EditRaw, CR_ResizeDat, CR_ResizeRaw];
109
110	<	Result   := True;
126	<	FBackend := ODB_ADB;
110	>	UpdateListCache;
111		end;
112
113
114
115
116	<	procedure TOniDataADB.Close;
116	>	procedure TAccess_OUP_ADB.Close;
117		begin
118	+	FQuery.Free;
119		FDatabase.Close;
120		FDatabase.Free;
121		Self.Free;
#	Line 138 | Line 123 | end;
123
124
125
126	<	procedure TOniDataADB.UpdateListCache;
126	>	procedure TAccess_OUP_ADB.UpdateListCache;
127		var
128	<	i:     LongWord;
128	>	i:     Integer;
129		temps: String;
130		begin
131		FQuery.SQL.Text := 'SELECT id,name,extension,[size],contenttype FROM datfiles ORDER BY id ASC;';
132		FQuery.Open;
133	+	SetLength(Fdat_files, FQuery.RecordCount);
134		if FQuery.RecordCount > 0 then
135		begin
136		FQuery.First;
151	–	SetLength(Fdat_files, FQuery.RecordCount);
137		i := 0;
138		repeat
139		Fdat_files[i].ID := FQuery.FieldByName('id').AsInteger;
140		Fdat_files[i].Name := FQuery.FieldByName('name').AsString;
141		Fdat_files[i].Extension := FQuery.FieldByName('extension').AsString;
157	–	Fdat_files[i].FileName := FormatNumber(Fdat_files[i].ID, 5, '0') + '-' +
158	–	Fdat_files[i].Name + '.' + Fdat_files[0].Extension;
159	–	Fdat_files[i].FileNameHex := IntToHex(Fdat_files[i].ID, 4) + '-' +
160	–	Fdat_files[i].Name + '.' + Fdat_files[0].Extension;
142		Fdat_files[i].Size := FQuery.FieldByName('size').AsInteger;
143	<	Fdat_files[i].FileType := HexToLong(FQuery.FieldByName('contenttype').AsString);
143	>	Fdat_files[i].FileType := StrToInt('$'+FQuery.FieldByName('contenttype').AsString);
144		Fdat_files[i].DatAddr := 0;
164	–	Fdat_files[i].opened := False;
145		Inc(i);
146		FQuery.Next;
147		until FQuery.EOF;
148		end;
149		FQuery.Close;
150
171	–	SetLength(Fdat_extensionsmap, 0);
151		FQuery.SQL.Text :=
152		'SELECT extension,count(extension) AS x FROM datfiles GROUP BY extension ORDER BY extension ASC;';
153		FQuery.Open;
154	+	SetLength(Fdat_extensionsmap, FQuery.RecordCount);
155		if FQuery.RecordCount > 0 then
156		begin
177	–	SetLength(Fdat_extensionsmap, FQuery.RecordCount);
157		i := 0;
158		repeat
159	<	temps := FQuery.FieldByName('extension').AsString[1];
159	>	temps := FQuery.FieldByName('extension').AsString;
160		Fdat_extensionsmap[i].Extension[3] := temps[1];
161		Fdat_extensionsmap[i].Extension[2] := temps[2];
162		Fdat_extensionsmap[i].Extension[1] := temps[3];
#	Line 191 | Line 170 | begin
170		end;
171
172
173	<	function TOniDataADB.GetFileInfo(fileid: Integer): TFileInfo;
173	>
174	>	function TAccess_OUP_ADB.GetLinksToFile(FileID: Integer): TLinks;
175		var
176		i: Integer;
177		begin
178	+	SetLength(Result.ByName, 0);
179	+	FQuery.SQL.Text := 'SELECT src_link_offset, src_id FROM linkmap WHERE target_id = ' + IntToStr(FileID) + ' ORDER BY src_id ASC;';
180	+	FQuery.Open;
181	+	SetLength(Result.ByID, FQuery.RecordCount);
182	+	if FQuery.RecordCount > 0 then
183	+	begin
184	+	i := 0;
185	+	repeat
186	+	Result.ByID[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger;
187	+	Result.ByID[i].Destination := FQuery.FieldByName('src_id').AsInteger;
188	+	Inc(i);
189	+	FQuery.Next;
190	+	until FQuery.EOF;
191	+	end;
192	+	FQuery.Close;
193	+	end;
194	+
195	+	function TAccess_OUP_ADB.GetLinksFromFile(FileID: Integer): TLinks;
196	+	var
197	+	i: Integer;
198	+	begin
199	+	SetLength(Result.ByName, 0);
200	+	FQuery.SQL.Text := 'SELECT src_link_offset, target_id FROM linkmap WHERE src_id = ' + IntToStr(FileID) + ' ORDER BY target_id ASC;';
201	+	FQuery.Open;
202	+	SetLength(Result.ByID, FQuery.RecordCount);
203	+	if FQuery.RecordCount > 0 then
204	+	begin
205	+	i := 0;
206	+	repeat
207	+	Result.ByID[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger;
208	+	Result.ByID[i].Destination := FQuery.FieldByName('target_id').AsInteger;
209	+	Inc(i);
210	+	FQuery.Next;
211	+	until FQuery.EOF;
212	+	end;
213	+	FQuery.Close;
214	+	end;
215	+
216	+
217	+
218	+	function TAccess_OUP_ADB.GetFileInfo(fileid: Integer): TFileInfo;
219	+	begin
220		if fileid = -1 then
221		begin
222		Result := inherited GetFileInfo(fileid);
223		Exit;
224		end;
225	<	if fileid < Self.GetFilesCount then
226	<	begin
205	<	for i := 0 to High(Fdat_files) do
206	<	if Fdat_files[i].ID = fileid then
207	<	Break;
208	<	if i < Length(Fdat_files) then
209	<	Result := Fdat_files[i]
210	<	else
211	<	Result.ID := -1;
212	<	end
225	>	if fileid < Self.GetFileCount then
226	>	Result    := Fdat_files[fileid]
227		else
214	–	begin
228		Result.ID := -1;
216	–	end;
229		end;
230
231
232
233
234	<	function TOniDataADB.GetFilesList(ext: String; pattern: String;
235	<	NoEmptyFiles: Boolean; sort: TSortType): TStringArray;
234	>	function TAccess_OUP_ADB.GetFilesList(ext: String; pattern: String;
235	>	NoEmptyFiles: Boolean; SortType: TSortType): TStrings;
236		var
237	<	i: LongWord;
238	<	list: TStringList;
237	>	i:      Integer;
238	>	list:   TStringList;
239		id, name, extension: String;
240		fields: TStrings;
241
242		procedure getfields;
243		begin
244	<	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
245	<	if sort in [stIDAsc, stIDDesc] then
244	>	fields.CommaText := StringReplace(AnsiQuotedStr(list.Strings[i], '"'), ';', '","', [rfReplaceAll]);
245	>	if SortType in [ST_IDAsc, ST_IDDesc] then
246		begin
247		id := fields.Strings[0];
248		name := fields.Strings[1];
249		extension := fields.Strings[2];
250		end;
251	<	if sort in [stNameAsc, stNameDesc] then
251	>	if SortType in [ST_NameAsc, ST_NameDesc] then
252		begin
253		id := fields.Strings[1];
254		name := fields.Strings[0];
255		extension := fields.Strings[2];
256		end;
257	<	if sort in [stExtAsc, stExtDesc] then
257	>	if SortType in [ST_ExtAsc, ST_ExtDesc] then
258		begin
259		id := fields.Strings[1];
260		name := fields.Strings[2];
261		extension := fields.Strings[0];
262		end;
263	+	if SortType in [ST_ExtNameAsc, ST_ExtNameDesc] then
264	+	begin
265	+	id := fields.Strings[2];
266	+	name := fields.Strings[1];
267	+	extension := fields.Strings[0];
268	+	end;
269		end;
270
271		begin
272		list := TStringList.Create;
273		list.Sorted := True;
274	<	for i := 0 to High(Fdat_files) do
274	>	for i := 0 to GetFileCount - 1 do
275		begin
276		if ((Length(ext) = 0) or (Pos(Fdat_files[i].Extension, ext) > 0)) and
277		((Length(pattern) = 0) or
#	Line 261 | Line 279 | begin
279		begin
280		if (NoEmptyFiles = False) or ((Fdat_files[i].FileType and $02) = 0) then
281		begin
282	<	if AppSettings.FilenumbersAsHex then
265	<	id := IntToHex(Fdat_files[i].ID, 4)
266	<	else
267	<	id := FormatNumber(Fdat_files[i].ID, 5, '0');
282	>	id := FormatNumber(Fdat_files[i].ID, 5, '0');
283		name := Fdat_files[i].Name;
284		extension := Fdat_files[i].Extension;
285
286	<	case sort of
287	<	stIDAsc, stIDDesc:     list.Add(id + ';' + name + ';' + extension);
288	<	stNameAsc, stNameDesc: list.Add(name + ';' + id + ';' + extension);
289	<	stExtAsc, stExtDesc:   list.Add(extension + ';' + id + ';' + name);
286	>	case SortType of
287	>	ST_IDAsc, ST_IDDesc:     list.Add(id + ';' + name + ';' + extension);
288	>	ST_NameAsc, ST_NameDesc: list.Add(name + ';' + id + ';' + extension);
289	>	ST_ExtAsc, ST_ExtDesc:   list.Add(extension + ';' + id + ';' + name);
290	>	ST_ExtNameAsc, ST_ExtNameDesc: list.Add(name + ';' + extension + ';' + id);
291		end;
292		end;
293		end;
294		end;
295	<	SetLength(Result, list.Count);
296	<	fields := TStringList.Create;
297	<	if sort in [stIDAsc, stNameAsc, stExtAsc] then
298	<	for i := 0 to list.Count - 1 do
299	<	begin
300	<	getfields;
301	<	Result[i] := id + '-' + name + '.' + extension;
302	<	end
303	<	else
304	<	for i := list.Count - 1 downto 0 do
305	<	begin
306	<	getfields;
307	<	Result[list.Count - i - 1] := id + '-' + name + '.' + extension;
308	<	end;
295	>	if not Assigned(Result) then
296	>	Result := TStringList.Create;
297	>	if list.Count > 0 then
298	>	begin
299	>	fields := TStringList.Create;
300	>	if SortType in [ST_IDAsc, ST_NameAsc, ST_ExtAsc, ST_ExtNameAsc] then
301	>	for i := 0 to list.Count - 1 do
302	>	begin
303	>	getfields;
304	>	Result.Add(id + '-' + name + '.' + extension);
305	>	end
306	>	else
307	>	for i := list.Count - 1 downto 0 do
308	>	begin
309	>	getfields;
310	>	Result.Add(id + '-' + name + '.' + extension);
311	>	end;
312	>	fields.Free;
313	>	end;
314		list.Free;
294	–	fields.Free;
315		end;
316
317
318
319
320	<	function TOniDataADB.GetFilesCount: LongWord;
320	>	function TAccess_OUP_ADB.GetFileCount: Integer;
321		begin
322		Result := Length(Fdat_files);
323		end;
324
325
326	<
307	<
308	<	function TOniDataADB.GetExtensionsList: TStringArray;
326	>	function TAccess_OUP_ADB.GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings;
327		var
328	<	i: LongWord;
328	>	i: Integer;
329		begin
330	<	SetLength(Result, Length(Fdat_extensionsmap));
331	<	for i := 0 to High(Result) do
330	>	if not Assigned(Result) then
331	>	Result := TStringList.Create;
332	>	if Result is TStringList then
333	>	TStringList(Result).Sorted := True;
334	>	for i := 0 to Length(Fdat_extensionsmap) - 1 do
335		begin
336		with Fdat_extensionsmap[i] do
337		begin
338	<	Result[i] := Extension[3] + Extension[2] + Extension[1] + Extension[0] +
339	<	' (' + IntToStr(ExtCount) + ')';
338	>	case ExtListFormat of
339	>	EF_ExtOnly:
340	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0]);
341	>	EF_ExtCount:
342	>	Result.Add(Extension[3] + Extension[2] + Extension[1] + Extension[0] +
343	>	' (' + IntToStr(ExtCount) + ')');
344	>	end;
345		end;
346		end;
347		end;
348
349
350	<
325	<
326	<	function TOniDataADB.GetExtendedExtensionsList: TExtensionsMap;
350	>	procedure TAccess_OUP_ADB.LoadDatFile(FileID: Integer; var Target: TStream);
351		var
352	<	i, j:  LongWord;
353	<	temps: String;
330	<	Data:  Tdata;
331	<	begin
332	<	SetLength(Result, 0);
333	<	FQuery.SQL.Text := 'SELECT ext,ident FROM extlist ORDER BY ext ASC;';
334	<	FQuery.Open;
335	<	if FQuery.RecordCount > 0 then
336	<	begin
337	<	SetLength(Result, FQuery.RecordCount);
338	<	i := 0;
339	<	repeat
340	<	temps := FQuery.FieldByName('ext').AsString;
341	<	for j := 0 to 3 do
342	<	Result[i].Extension[j] := temps[4 - j];
343	<	Data := DecodeHexString(FQuery.FieldByName('ident').AsString);
344	<	for j := 0 to 7 do
345	<	Result[i].Ident[j] := Data[j];
346	<	Inc(i);
347	<	FQuery.Next;
348	<	until FQuery.EOF;
349	<	end;
350	<	FQuery.Close;
351	<	end;
352	<
353	<
354	<
355	<
356	<	function TOniDataADB.GetNamedFilesMap: TNamedFilesMap;
357	<	var
358	<	i:     LongWord;
359	<	temp:  Integer;
360	<	temps: String;
361	<	temparray: array of record
362	<	id: Integer;
363	<	fullname: String[50];
364	<	end;
352	>	mem: TStream;
353	>	streampos: Integer;
354		begin
355	<	SetLength(temparray, 0);
367	<	FQuery.SQL.Text :=
368	<	'SELECT id,(extension+name) AS xname FROM datfiles WHERE Length(name)>0 ORDER BY extension,name ASC;';
369	<	FQuery.Open;
370	<	if FQuery.RecordCount > 0 then
355	>	if fileid < GetFileCount then
356		begin
357	<	repeat
358	<	temp  := FQuery.FieldByName('id').AsInteger;
374	<	temps := FQuery.FieldByName('xname').AsString;
375	<
376	<	SetLength(temparray, Length(temparray) + 1);
377	<	if Length(temparray) > 1 then
378	<	begin
379	<	for i := High(temparray) - 1 downto 0 do
380	<	begin
381	<	if StringSmaller(temps, temparray[i].fullname) then
382	<	begin
383	<	temparray[i + 1] := temparray[i];
384	<	if i = 0 then
385	<	begin
386	<	temparray[i].id := temp;
387	<	temparray[i].fullname := temps;
388	<	end;
389	<	end
390	<	else
391	<	begin
392	<	temparray[i + 1].id := temp;
393	<	temparray[i + 1].fullname := temps;
394	<	Break;
395	<	end;
396	<	end;
397	<	end
398	<	else
399	<	begin
400	<	temparray[0].id := temp;
401	<	temparray[0].fullname := temps;
402	<	end;
403	<	FQuery.Next;
404	<	until FQuery.EOF;
405	<	end;
406	<	FQuery.Close;
407	<	SetLength(Result, Length(temparray));
408	<	for i := 0 to High(temparray) do
409	<	begin
410	<	Result[i].FileNumber := temparray[i].id;
411	<	Result[i].blubb      := 0;
412	<	end;
413	<	end;
414	<
357	>	if not Assigned(Target) then
358	>	Target := TMemoryStream.Create;
359
360	+	streampos := Target.Position;
361
417	–
418	–	function TOniDataADB.LoadDatFile(fileid: LongWord): Tdata;
419	–	var
420	–	mem: TStream;
421	–	begin
422	–	if fileid < Self.GetFilesCount then
423	–	begin
362		FQuery.SQL.Text := 'SELECT data FROM datfiles WHERE id=' + IntToStr(fileid) + ';';
363		FQuery.Open;
364		if FQuery.RecordCount > 0 then
365		begin
366		mem := FQuery.CreateBlobStream(FQuery.FieldByName('data'), bmRead);
429	–	SetLength(Result, mem.Size);
367		mem.Seek(0, soFromBeginning);
368	<	mem.Read(Result[0], mem.Size);
368	>	Target.CopyFrom(mem, mem.Size);
369		mem.Free;
370		end;
371		FQuery.Close;
372	+
373	+	Target.Seek(streampos, soFromBeginning);
374		end;
375		end;
376
377	<
439	<
440	<
441	<	procedure TOniDataADB.UpdateDatFile(fileid: LongWord; Data: Tdata);
377	>	procedure TAccess_OUP_ADB.UpdateDatFile(FileID: Integer; Src: TStream);
378		var
379		MimeCoder: TStringFormat_MIME64;
380		mem: TMemoryStream;
381		begin
382	<	if fileid < Self.GetFilesCount then
382	>	if fileid < GetFileCount then
383		begin
384		mimecoder := TStringFormat_MIME64.Create;
385		mem := TMemoryStream.Create;
386	<	mem.Write(Data[0], Length(Data));
451	<	mem.Seek(0, soFromBeginning);
386	>	mem.CopyFrom(Src, Src.Size);
387		FQuery.SQL.Text := 'UPDATE datfiles SET data=MimeToBin("' +
388		MimeCoder.StrTo(mem.Memory, mem.Size) + '"), size=' + IntToStr(mem.Size) +
389		' WHERE id=' + IntToStr(fileid) + ';';
#	Line 456 | Line 391 | begin
391		mem.Free;
392		mimecoder.Free;
393		end;
459	–	UpdateListCache;
394		end;
395
396
397
398	<
465	<	procedure TOniDataADB.LoadDatFilePart(fileid, offset, size: LongWord; target: Pointer);
398	>	procedure TAccess_OUP_ADB.LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream);
399		var
400	+	streampos: Integer;
401		mem: TStream;
402		begin
403	<	if fileid < Self.GetFilesCount then
403	>	if fileid < GetFileCount then
404		begin
405	+	if not Assigned(Target) then
406	+	Target := TMemoryStream.Create;
407	+	streampos := Target.Position;
408	+
409		FQuery.SQL.Text := 'SELECT data FROM datfiles WHERE id=' + IntToStr(fileid) + ';';
410		FQuery.Open;
411		if FQuery.RecordCount > 0 then
412		begin
413		mem := FQuery.CreateBlobStream(FQuery.FieldByName('data'), bmRead);
414		mem.Seek(offset, soFromBeginning);
415	<	mem.Read(target^, size);
415	>	Target.CopyFrom(mem, size);
416		mem.Free;
417		end;
418		FQuery.Close;
419	+	Target.Seek(streampos, soFromBeginning);
420		end;
421		end;
422
423
424
425	<
487	<	procedure TOniDataADB.UpdateDatFilePart(fileid, offset, size: LongWord; target: Pointer);
425	>	procedure TAccess_OUP_ADB.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream);
426		var
427		MimeCoder: TStringFormat_MIME64;
428		mem:  TMemoryStream;
491	–	Data: Tdata;
429		begin
430	<	if fileid < Self.GetFilesCount then
430	>	if fileid < GetFileCount then
431		begin
432	<	Data := Self.LoadDatFile(fileid);
433	<	mimecoder := TStringFormat_MIME64.Create;
434	<	mem := TMemoryStream.Create;
435	<	mem.Write(Data[0], Length(Data));
499	<	mem.Seek(offset, soFromBeginning);
500	<	mem.Write(target^, size);
432	>	mem := nil;
433	>	LoadDatFile(fileid, TStream(mem));
434	>	mem.Seek(Offset, soFromBeginning);
435	>	mem.CopyFrom(Src, Size);
436		mem.Seek(0, soFromBeginning);
437	+	mimecoder := TStringFormat_MIME64.Create;
438		FQuery.SQL.Text := 'UPDATE datfiles SET data=MimeToBin("' +
439		MimeCoder.StrTo(mem.Memory, mem.Size) + '") WHERE id=' + IntToStr(fileid) + ';';
440		FQuery.ExecSQL;
#	Line 508 | Line 444 | begin
444		end;
445
446
447	<
512	<
513	<	function TOniDataADB.GetRawList(fileid: LongWord): TRawList;
447	>	function TAccess_OUP_ADB.GetRawList(FileID: Integer): TRawDataList;
448		var
449	<	i: LongWord;
449	>	i: Integer;
450		begin
451		SetLength(Result, 0);
452		FQuery.SQL.Text := 'SELECT [src_link_offset],[size],[sep] FROM rawmap WHERE [src_id]=' +
#	Line 524 | Line 458 | begin
458		SetLength(Result, FQuery.RecordCount);
459		i := 0;
460		repeat
461	<	Result[i].src_id     := fileid;
462	<	Result[i].src_offset := FQuery.FieldByName('src_link_offset').AsInteger;
463	<	Result[i].raw_addr   := 0;
464	<	Result[i].raw_size   := FQuery.FieldByName('size').AsInteger;
465	<	Result[i].loc_sep    := FQuery.FieldByName('sep').AsBoolean;
461	>	Result[i].SrcID     := fileid;
462	>	Result[i].SrcOffset := FQuery.FieldByName('src_link_offset').AsInteger;
463	>	Result[i].RawAddr   := 0;
464	>	Result[i].RawSize   := FQuery.FieldByName('size').AsInteger;
465	>	Result[i].LocSep    := FQuery.FieldByName('sep').AsBoolean;
466		Inc(i);
467		FQuery.Next;
468		until FQuery.EOF;
#	Line 537 | Line 471 | begin
471		end;
472
473
474	+	function TAccess_OUP_ADB.GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
475	+	var
476	+	i: Integer;
477	+	rawlist: TRawDataList;
478	+	begin
479	+	rawlist := GetRawList(FileID);
480	+	if Length(rawlist) > 0 then
481	+	begin
482	+	for i := 0 to High(rawlist) do
483	+	if rawlist[i].SrcOffset = DatOffset then
484	+	Break;
485	+	if i < Length(rawlist) then
486	+	Result := rawlist[i]
487	+	else begin
488	+	Result.SrcID     := -1;
489	+	Result.SrcOffset := -1;
490	+	Result.RawAddr   := -1;
491	+	Result.RawSize   := -1;
492	+	end;
493	+	end;
494	+	end;
495
496
497	<	procedure TOniDataADB.LoadRawFile(fileid, dat_offset: LongWord; target: Pointer);
497	>
498	>	procedure TAccess_OUP_ADB.LoadRawFile(FileID, DatOffset: Integer; var Target: TStream);
499		var
500		mem: TStream;
501	+	streampos: Integer;
502		begin
503	<	if fileid < Self.GetFilesCount then
503	>	if fileid < GetFileCount then
504		begin
505	+	if not Assigned(Target) then
506	+	Target := TMemoryStream.Create;
507	+	streampos := Target.Position;
508		FQuery.SQL.Text := 'SELECT data FROM rawmap WHERE (src_id=' +
509	<	IntToStr(fileid) + ') AND (src_link_offset=' + IntToStr(dat_offset) + ');';
509	>	IntToStr(FileID) + ') AND (src_link_offset=' + IntToStr(DatOffset) + ');';
510		FQuery.Open;
511		if FQuery.RecordCount > 0 then
512		begin
513		mem := FQuery.CreateBlobStream(FQuery.FieldByName('data'), bmRead);
514		mem.Seek(0, soFromBeginning);
515	<	mem.Read(target^, mem.size);
515	>	Target.CopyFrom(mem, mem.Size);
516		mem.Free;
517		end;
518		FQuery.Close;
519	+	Target.Seek(streampos, soFromBeginning);
520		end;
521		end;
522
523
524	<
564	<
565	<	procedure TOniDataADB.UpdateRawFile(fileid, dat_offset: LongWord;
566	<	size: LongWord; target: Pointer);
524	>	procedure TAccess_OUP_ADB.UpdateRawFile(FileID, DatOffset: Integer; Src: TStream);
525		var
526		MimeCoder: TStringFormat_MIME64;
527		mem: TMemoryStream;
528		begin
529	<	if fileid < Self.GetFilesCount then
529	>	if fileid < GetFileCount then
530		begin
531		mimecoder := TStringFormat_MIME64.Create;
532		mem := TMemoryStream.Create;
533	<	mem.Write(target^, size);
533	>	mem.CopyFrom(Src, Src.Size);
534		mem.Seek(0, soFromBeginning);
535		FQuery.SQL.Text := 'UPDATE rawmap SET data=MimeToBin("' + MimeCoder.StrTo(
536	<	mem.Memory, mem.Size) + '") WHERE (src_id=' + IntToStr(fileid) +
537	<	') AND (src_link_offset=' + IntToStr(dat_offset) + ');';
536	>	mem.Memory, mem.Size) + '") WHERE (src_id=' + IntToStr(FileID) +
537	>	') AND (src_link_offset=' + IntToStr(DatOffset) + ');';
538		FQuery.ExecSQL;
539		mem.Free;
540		mimecoder.Free;
#	Line 586 | Line 544 | end;
544
545
546
547	<	procedure TOniDataADB.LoadRawFilePart(fileid, dat_offset: LongWord;
590	<	offset, size: LongWord; target: Pointer);
547	>	procedure TAccess_OUP_ADB.LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream);
548		var
592	–	Data: Tdata;
549		mem:  TMemoryStream;
550	+	streampos: Integer;
551		begin
552	<	if fileid < Self.GetFilesCount then
552	>	if fileid < GetFileCount then
553		begin
554	<	SetLength(Data, Self.GetRawInfo(fileid, dat_offset).raw_size);
555	<	Self.LoadRawFile(fileid, dat_offset, @Data[0]);
556	<	mem := TMemoryStream.Create;
557	<	mem.Write(Data[offset], size);
558	<	mem.Read(target^, size);
554	>	if not Assigned(Target) then
555	>	Target := TMemoryStream.Create;
556	>	streampos := Target.Position;
557	>	mem := nil;
558	>	LoadRawFile(FileID, DatOffset, TStream(mem));
559	>	mem.Seek(Offset, soFromBeginning);
560	>	Target.CopyFrom(mem, Size);
561		mem.Free;
562	+	Target.Seek(streampos, soFromBeginning);
563		end;
564		end;
565
566
567
568
569	<	procedure TOniDataADB.UpdateRawFilePart(fileid, dat_offset: LongWord;
610	<	offset, size: LongWord; target: Pointer);
569	>	procedure TAccess_OUP_ADB.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream);
570		var
571		MimeCoder: TStringFormat_MIME64;
572		mem:  TMemoryStream;
614	–	Data: Tdata;
573		begin
574	<	if fileid < Self.GetFilesCount then
574	>	if fileid < GetFileCount then
575		begin
576	<	SetLength(Data, Self.GetRawInfo(fileid, offset).raw_size);
577	<	Self.LoadRawFile(fileid, offset, @Data[0]);
620	<	mimecoder := TStringFormat_MIME64.Create;
621	<	mem := TMemoryStream.Create;
622	<	mem.Write(Data[0], Length(Data));
576	>	mem := nil;
577	>	LoadRawFile(fileid, offset, TStream(mem));
578		mem.Seek(offset, soFromBeginning);
579	<	mem.Write(target^, size);
579	>	mem.CopyFrom(Src, Size);
580		mem.Seek(0, soFromBeginning);
581	+	mimecoder := TStringFormat_MIME64.Create;
582		FQuery.SQL.Text := 'UPDATE rawmap SET data=MimeToBin("' + MimeCoder.StrTo(
583		mem.Memory, mem.Size) + '") WHERE (src_id=' + IntToStr(fileid) +
584	<	') AND (src_link_offset=' + IntToStr(dat_offset) + ');';
584	>	') AND (src_link_offset=' + IntToStr(DatOffset) + ');';
585		FQuery.ExecSQL;
586		mem.Free;
587		mimecoder.Free;
588		end;
589		end;
590
591	<	}
591	>
592
593
594		end.

Diff Legend

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