ViewVC Help

View File | Revision Log | View Changeset | Root Listing

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

Comparing:
oup/rewrite/DataAccess/DataAccess.pas (file contents), Revision 101 by alloc, Tue Feb 20 20:43:29 2007 UTC vs.
oup/current/DataAccess/DataAccess.pas (file contents), Revision 227 by alloc, Tue Jun 19 22:06:10 2007 UTC

#	Line 1 | Line 1
1		unit DataAccess;
2		interface
3
4	<	uses TypeDefs, Classes, StrUtils, SysUtils;
4	>	uses TypeDefs, Classes, StrUtils, SysUtils, _MetaManager;
5
6		type
7		TDataAccess = class
#	Line 13 | Line 13 | type
13		FDataOS:        TDataOS;
14		FLevelNumber:   Integer;
15		FChangeRights:  TChangeRights;
16	+	FMeta:          TMetaManager;
17		procedure SetDataOS(DataOS: TDataOS);
18		public
19		property ConnectionID: Integer      read FConnectionID;
#	Line 21 | Line 22 | type
22		property DataOS:       TDataOS      read FDataOS write SetDataOS;
23		property LevelNumber:  Integer      read FLevelNumber;
24		property ChangeRights: TChangeRights read FChangeRights;
25	+	property MetaData:     TMetaManager read FMeta;
26
27		constructor Create(FileName: String; ConnectionID: Integer; var Msg: TStatusMessages); virtual; abstract;
28		procedure Close; virtual; abstract;
#	Line 41 | Line 43 | type
43		procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TByteData); overload;
44		procedure LoadDatFilePart(FileID, Offset, Size: Integer; Target: Pointer); overload;
45		procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
44	–	procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData); overload;
46		procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); overload;
47
48	+	function GetDatLinks(FileID: Integer): TDatLinkList; virtual; abstract;
49	+	function GetDatLink(FileID, DatOffset: Integer): TDatLink; virtual; abstract;
50		function GetRawList(FileID: Integer): TRawDataList; virtual; abstract;
51		function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; virtual; abstract;
52
#	Line 55 | Line 58 | type
58		procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TByteData); overload;
59		procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; Target: Pointer); overload;
60		procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
58	–	procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData); overload;
61		procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer); overload;
62
63	<	function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; virtual;
64	<	function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer; overload;
65	<	function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload;
63	>	function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; virtual;
64	>	function AppendRawFile(LocSep: Boolean; Src: TByteData): Integer; overload;
65	>	//    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload;
66		published
67		end;
68
#	Line 172 | Line 174 | begin
174		end;
175		end;
176
175	–	procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData);
176	–	var
177	–	data: TStream;
178	–	begin
179	–	if fileid < GetFileCount then
180	–	begin
181	–	data := TMemoryStream.Create;
182	–	data.Write(Src[0], Size);
183	–	data.Seek(0, soFromBeginning);
184	–	UpdateDatFilePart(FileID, offset, size, data);
185	–	data.Free;
186	–	end;
187	–	end;
188	–
177		procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer);
178		var
179		data: TStream;
#	Line 259 | Line 247 | begin
247		end;
248		end;
249
262	–	procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData);
263	–	var
264	–	data: TStream;
265	–	begin
266	–	if fileid < GetFileCount then
267	–	begin
268	–	data := TMemoryStream.Create;
269	–	data.Write(Src[0], Size);
270	–	data.Seek(0, soFromBeginning);
271	–	UpdateRawFilePart(FileID, DatOffset, Offset, Size, data);
272	–	data.Free;
273	–	end;
274	–	end;
275	–
250		procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer);
251		var
252		data: TStream;
#	Line 288 | Line 262 | begin
262		end;
263
264
265	<	function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer;
265	>	function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
266		begin
267		raise ENotImplemented.Create('ERROR: AppendRawFile not implemented here!!!');
268		end;
269
270
271	<	function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer;
271	>	function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TByteData): Integer;
272		var
273		data: TStream;
274		begin
275		data := TMemoryStream.Create;
276	<	data.Write(Src[0], Size);
277	<	AppendRawFile(LocSep, Size, data);
276	>	data.Write(Src[0], Length(Src));
277	>	data.Seek(0, soFromBeginning);
278	>	Result := AppendRawFile(LocSep, data);
279		data.Free;
280		end;
281	<
281	>	{
282		function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer;
283		var
284		data: TStream;
285		begin
286		data := TMemoryStream.Create;
287		data.Write(Src^, Size);
288	<	AppendRawFile(LocSep, Size, data);
288	>	data.Seek(0, soFromBeginning);
289	>	Result := AppendRawFile(LocSep, data);
290		data.Free;
291		end;
292	<
292	>	}
293
294
295		procedure TDataAccess.SetDataOS(DataOS: TDataOS);

Diff Legend

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