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

Diff Legend

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