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

Diff Legend

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