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 105 by alloc, Wed Feb 21 00:29:27 2007 UTC vs.
oup/current/DataAccess/DataAccess.pas (file contents), Revision 241 by alloc, Tue Jul 17 22:27:16 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;
27	>	constructor Create(FileName: String; ConnectionID: Integer; var Msg: TStatusMessages); virtual;
28		procedure Close; virtual; abstract;
29
30		function ExtractFileIDOfName(Name: String): Integer; virtual;
#	Line 43 | Line 45 | type
45		procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
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	+	function GetRawsForType(RawType: String): TRawDataList; virtual; abstract;
53
54		procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; virtual; abstract;
55		procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TByteData); overload;
#	Line 58 | Line 63 | type
63
64		function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; virtual;
65		function AppendRawFile(LocSep: Boolean; Src: TByteData): Integer; overload;
66	<	function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload;
66	>	//    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload;
67		published
68		end;
69
#	Line 71 | Line 76 | implementation
76		Implementation of TDataAccess
77		*)
78
79	+	constructor TDataAccess.Create(FileName: String; ConnectionID: Integer;
80	+	var Msg: TStatusMessages);
81	+	begin
82	+	FMeta := TMetaManager.Create(FConnectionID, Self);
83	+	end;
84	+
85	+
86	+
87		function TDataAccess.ExtractFileIDOfName(Name: String): Integer;
88		begin
89		if Name[5] = '-' then
#	Line 271 | Line 284 | begin
284		data := TMemoryStream.Create;
285		data.Write(Src[0], Length(Src));
286		data.Seek(0, soFromBeginning);
287	<	AppendRawFile(LocSep, data);
287	>	Result := AppendRawFile(LocSep, data);
288		data.Free;
289		end;
290	<
290	>	{
291		function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer;
292		var
293		data: TStream;
#	Line 282 | Line 295 | begin
295		data := TMemoryStream.Create;
296		data.Write(Src^, Size);
297		data.Seek(0, soFromBeginning);
298	<	AppendRawFile(LocSep, data);
298	>	Result := AppendRawFile(LocSep, data);
299		data.Free;
300		end;
301	<
301	>	}
302
303
304		procedure TDataAccess.SetDataOS(DataOS: TDataOS);

Diff Legend

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