--- oup/rewrite/DataAccess/DataAccess.pas	2007/01/18 17:15:59	93
+++ oup/rewrite/DataAccess/DataAccess.pas	2007/01/22 23:05:45	97
@@ -12,14 +12,17 @@ type
     FConnectionID:  Integer;
     FFileName:      String;
     FBackend:       TDataBackend;
+    FDataOS:        TDataOS;
     FLevelNumber:   Integer;
     FChangeRights:  TChangeRights;
+    procedure SetDataOS(DataOS: TDataOS);
   protected
   public
     property ConnectionID: Integer      read FConnectionID;
-    property FileName:    String        read FFileName;
-    property Backend:     TDataBackend  read FBackend;
-    property LevelNumber: Integer       read FLevelNumber;
+    property FileName:     String       read FFileName;
+    property Backend:      TDataBackend read FBackend;
+    property DataOS:       TDataOS      read FDataOS write SetDataOS;
+    property LevelNumber:  Integer      read FLevelNumber;
 
     constructor Create(FileName: String; ConnectionID: Integer; var Msg: TStatusMessages); virtual; abstract;
     procedure Close; virtual; abstract;
@@ -33,51 +36,38 @@ type
     function GetExtensionsList(ExtListFormat: TExtensionFormat): TStrings; virtual; abstract;
 
     procedure LoadDatFile(FileID: Integer; var Target: TStream); overload; virtual; abstract;
-    procedure LoadDatFile(FileID: Integer; var Target: TByteArray); overload; virtual; abstract;
+    procedure LoadDatFile(FileID: Integer; var Target: TByteData); overload; virtual; abstract;
     procedure UpdateDatFile(FileID: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateDatFile(FileID: Integer; Src: TByteArray); overload; virtual; abstract;
+    procedure UpdateDatFile(FileID: Integer; Src: TByteData); overload; virtual; abstract;
     procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TStream); overload; virtual; abstract;
-    procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TByteArray); overload; virtual; abstract;
+    procedure LoadDatFilePart(FileID, Offset, Size: Integer; var Target: TByteData); overload; virtual; abstract;
     procedure LoadDatFilePart(FileID, Offset, Size: Integer; Target: Pointer); overload; virtual; abstract;
     procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteArray); overload; virtual; abstract;
+    procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData); overload; virtual; abstract;
     procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); overload; virtual; abstract;
 
     function GetRawList(FileID: Integer): TRawDataList; virtual; abstract;
     function GetRawInfo(FileID, DatOffset: Integer): TRawDataInfo;
 
     procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TStream); overload; virtual; abstract;
-    procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TByteArray); overload; virtual; abstract;
+    procedure LoadRawFile(FileID, DatOffset: Integer; var Target: TByteData); overload; virtual; abstract;
     procedure UpdateRawFile(FileID, DatOffset, Size: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateRawFile(FileID, DatOffset, Size: Integer; Src: TByteArray); overload; virtual; abstract;
+    procedure UpdateRawFile(FileID, DatOffset, Size: Integer; Src: TByteData); overload; virtual; abstract;
     procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TStream); overload; virtual; abstract;
-    procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TByteArray); overload; virtual; abstract;
+    procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; var Target: TByteData); overload; virtual; abstract;
     procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; Target: Pointer); overload; virtual; abstract;
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteArray); overload; virtual; abstract;
+    procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData); overload; virtual; abstract;
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer); overload; virtual; abstract;
 
     function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; virtual; abstract;
-    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteArray): Integer; overload; virtual; abstract;
+    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer; overload; virtual; abstract;
     function AppendRawFile(LocSep: Boolean; Size: Integer; Src: Pointer): Integer; overload; virtual; abstract;
   published
   end;
 
 
 
-
-
-{
-var
-  DataConnections: array of TOniData;
-
-function CreateDataConnection(filename: String; backend: Integer): TOniData;
-function ConnectionExists(filename: String): TOniData;
-procedure CloseDataConnection(connection: TOniData);
-function GetEmptyFileInfo: TFileInfo;
-}
-
-
 implementation
 
 
@@ -157,5 +147,9 @@ begin
 end;
 
 
+procedure TDataAccess.SetDataOS(DataOS: TDataOS);
+begin
+  raise ENotImplemented.Create('TDataAccess.SetDataOS: TBD!');
+end;
 
 end.