--- oup/rewrite/DataAccess/DataAccess.pas 2007/02/21 00:29:27 105 +++ oup/current/DataAccess/DataAccess.pas 2007/06/19 22:06:10 227 @@ -1,7 +1,7 @@ unit DataAccess; interface -uses TypeDefs, Classes, StrUtils, SysUtils; +uses TypeDefs, Classes, StrUtils, SysUtils, _MetaManager; type TDataAccess = class @@ -13,6 +13,7 @@ type FDataOS: TDataOS; FLevelNumber: Integer; FChangeRights: TChangeRights; + FMeta: TMetaManager; procedure SetDataOS(DataOS: TDataOS); public property ConnectionID: Integer read FConnectionID; @@ -21,6 +22,7 @@ type property DataOS: TDataOS read FDataOS write SetDataOS; property LevelNumber: Integer read FLevelNumber; property ChangeRights: TChangeRights read FChangeRights; + property MetaData: TMetaManager read FMeta; constructor Create(FileName: String; ConnectionID: Integer; var Msg: TStatusMessages); virtual; abstract; procedure Close; virtual; abstract; @@ -43,6 +45,8 @@ type procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract; procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); overload; + function GetDatLinks(FileID: Integer): TDatLinkList; virtual; abstract; + function GetDatLink(FileID, DatOffset: Integer): TDatLink; virtual; abstract; function GetRawList(FileID: Integer): TRawDataList; virtual; abstract; function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo; virtual; abstract; @@ -58,7 +62,7 @@ type function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; virtual; function AppendRawFile(LocSep: Boolean; Src: TByteData): Integer; overload; - function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload; +// function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload; published end; @@ -271,10 +275,10 @@ begin data := TMemoryStream.Create; data.Write(Src[0], Length(Src)); data.Seek(0, soFromBeginning); - AppendRawFile(LocSep, data); + Result := AppendRawFile(LocSep, data); data.Free; end; - +{ function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; var data: TStream; @@ -282,10 +286,10 @@ begin data := TMemoryStream.Create; data.Write(Src^, Size); data.Seek(0, soFromBeginning); - AppendRawFile(LocSep, data); + Result := AppendRawFile(LocSep, data); data.Free; end; - +} procedure TDataAccess.SetDataOS(DataOS: TDataOS);