Changeset 105 for oup/rewrite/DataAccess

Timestamp:

Feb 21, 2007, 1:29:27 AM (18 years ago)

Author:

alloc

Message:

 

Location:

oup/rewrite/DataAccess

Files:

• Access_OUP_ADB.pas (modified) (1 diff)
• Access_OniArchive.pas (modified) (5 diffs)
• DataAccess.pas (modified) (7 diffs)

oup/rewrite/DataAccess/Access_OUP_ADB.pas

@@ -103 +103 @@
   FBackend := DB_ADB;
 
+  FConnectionID := ConnectionID;
   FChangeRights := [CR_EditDat, CR_EditRaw, CR_ResizeDat, CR_ResizeRaw];
 

oup/rewrite/DataAccess/Access_OniArchive.pas

@@ -43 +43 @@
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; override;
 
-    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; override;
+    function AppendRawFile(LocSep: Boolean; Src: TStream): Integer; overload; override;
   published
   end;
@@ -184 +184 @@
   Msg := SM_OK;
   FBackend := DB_ONI;
+  FConnectionID := ConnectionID;
   FChangeRights := [CR_EditDat, CR_EditRaw, CR_AppendRaw];
 end;
@@ -616 +617 @@
 end;
 
-function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer;
+function TAccess_OniArchive.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
 begin
   if not LocSep then
@@ -625 +626 @@
     Result := Fraw_file.Size;
     Fraw_file.Seek(0, soFromEnd);
-    Fraw_file.CopyFrom(Src, Size);
+    Fraw_file.CopyFrom(Src, Src.Size);
     if UnloadWhenUnused then
     begin
@@ -641 +642 @@
     Result := Fsep_file.Size;
     Fsep_file.Seek(0, soFromEnd);
-    Fsep_file.CopyFrom(Src, Size);
+    Fsep_file.CopyFrom(Src, Src.Size);
     if UnloadWhenUnused then
     begin

oup/rewrite/DataAccess/DataAccess.pas

@@ -42 +42 @@
     procedure LoadDatFilePart(FileID, Offset, Size: Integer; Target: Pointer); overload;
     procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData); overload;
     procedure UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer); overload;
 
@@ -56 +55 @@
     procedure LoadRawFilePart(FileID, DatOffset, Offset, Size: Integer; Target: Pointer); overload;
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TStream); overload; virtual; abstract;
-    procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData); overload;
     procedure UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer); overload;
 
-    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer; overload; virtual;
-    function AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer; overload;
+    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;
   published
@@ -173 +171 @@
 end;
 
-procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: TByteData);
-var
-  data: TStream;
-begin
-  if fileid < GetFileCount then
-  begin
-    data := TMemoryStream.Create;
-    data.Write(Src[0], Size);
-    data.Seek(0, soFromBeginning);
-    UpdateDatFilePart(FileID, offset, size, data);
-    data.Free;
-  end;
-end;
-
 procedure TDataAccess.UpdateDatFilePart(FileID, Offset, Size: Integer; Src: Pointer);
 var
@@ -260 +244 @@
 end;
 
-procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: TByteData);
-var
-  data: TStream;
-begin
-  if fileid < GetFileCount then
-  begin
-    data := TMemoryStream.Create;
-    data.Write(Src[0], Size);
+procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer);
+var
+  data: TStream;
+begin
+  if fileid < GetFileCount then
+  begin
+    data := TMemoryStream.Create;
+    data.Write(Src^, Size);
     data.Seek(0, soFromBeginning);
     UpdateRawFilePart(FileID, DatOffset, Offset, Size, data);
@@ -274 +258 @@
 end;
 
-procedure TDataAccess.UpdateRawFilePart(FileID, DatOffset, Offset, Size: Integer; Src: Pointer);
-var
-  data: TStream;
-begin
-  if fileid < GetFileCount then
-  begin
-    data := TMemoryStream.Create;
-    data.Write(Src^, Size);
-    data.Seek(0, soFromBeginning);
-    UpdateRawFilePart(FileID, DatOffset, Offset, Size, data);
-    data.Free;
-  end;
-end;
-
-
-function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TStream): Integer;
+
+function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TStream): Integer;
 begin
   raise ENotImplemented.Create('ERROR: AppendRawFile not implemented here!!!');
@@ -295 +265 @@
 
 
-function TDataAccess.AppendRawFile(LocSep: Boolean; Size: Integer; Src: TByteData): Integer;
+function TDataAccess.AppendRawFile(LocSep: Boolean; Src: TByteData): Integer;
 var
   data: TStream;
 begin
   data := TMemoryStream.Create;
-  data.Write(Src[0], Size);
-  AppendRawFile(LocSep, Size, data);
+  data.Write(Src[0], Length(Src));
+  data.Seek(0, soFromBeginning);
+  AppendRawFile(LocSep, data);
   data.Free;
 end;
@@ -311 +282 @@
   data := TMemoryStream.Create;
   data.Write(Src^, Size);
-  AppendRawFile(LocSep, Size, data);
+  data.Seek(0, soFromBeginning);
+  AppendRawFile(LocSep, data);
   data.Free;
 end;