[tdbf-cvs] tdbf Dbf_DbfFile.pas,1.54,1.55 Dbf_Memo.pas,1.23,1.24 history.txt,1.56,1.57

[Micha N. <md...@us...>]

Update of /cvsroot/tdbf/tdbf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1110

Modified Files:
	Dbf_DbfFile.pas Dbf_Memo.pas history.txt 
Log Message:
fixed: tryexclusive/packtable/endexclusive fail because of memo (rep by sysklop)

Index: history.txt
===================================================================
RCS file: /cvsroot/tdbf/tdbf/history.txt,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** history.txt	18 Aug 2004 09:01:20 -0000	1.56
--- history.txt	18 Aug 2004 12:55:59 -0000	1.57
***************
*** 46,49 ****
--- 46,50 ----
  - added: TDbf.PrepareKey for conversion of key to numeric index key format
  - fixed: set physicalrecno to non-existing recno corrupts table (rep by luchop)
+ - fixed: tryexclusive/packtable/endexclusive fail because of memo (rep by sysklop)
  
  

Index: Dbf_DbfFile.pas
===================================================================
RCS file: /cvsroot/tdbf/tdbf/Dbf_DbfFile.pas,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** Dbf_DbfFile.pas	16 Jul 2004 14:43:55 -0000	1.54
--- Dbf_DbfFile.pas	18 Aug 2004 12:55:44 -0000	1.55
***************
*** 459,463 ****
          else
            MemoFileClass := TDbaseMemoFile;
!         FMemoFile := MemoFileClass.Create;
          FMemoFile.FileName := lMemoFileName;
          FMemoFile.Mode := Mode;
--- 459,463 ----
          else
            MemoFileClass := TDbaseMemoFile;
!         FMemoFile := MemoFileClass.Create(Self);
          FMemoFile.FileName := lMemoFileName;
          FMemoFile.Mode := Mode;
***************
*** 703,709 ****
      lMemoFileName := ChangeFileExt(FileName, GetMemoExt);
      if FDbfVersion = xFoxPro then
!       FMemoFile := TFoxProMemoFile.Create
      else
!       FMemoFile := TDbaseMemoFile.Create;
      FMemoFile.FileName := lMemoFileName;
      FMemoFile.Mode := Mode;
--- 703,709 ----
      lMemoFileName := ChangeFileExt(FileName, GetMemoExt);
      if FDbfVersion = xFoxPro then
!       FMemoFile := TFoxProMemoFile.Create(Self)
      else
!       FMemoFile := TDbaseMemoFile.Create(Self);
      FMemoFile.FileName := lMemoFileName;
      FMemoFile.Mode := Mode;

Index: Dbf_Memo.pas
===================================================================
RCS file: /cvsroot/tdbf/tdbf/Dbf_Memo.pas,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Dbf_Memo.pas	12 Jul 2004 07:37:57 -0000	1.23
--- Dbf_Memo.pas	18 Aug 2004 12:55:59 -0000	1.24
***************
*** 15,18 ****
--- 15,19 ----
    TMemoFile = class(TPagedFile)
    protected
+     FDbfFile: pointer;
      FDbfVersion: xBaseVersion;
      FMemoRecordSize: Integer;
***************
*** 26,30 ****
      procedure SetBlockLen(BlockLen: Integer); virtual; abstract;
    public
!     constructor Create;
      destructor Destroy; override;
  
--- 27,31 ----
      procedure SetBlockLen(BlockLen: Integer); virtual; abstract;
    public
!     constructor Create(ADbfFile: pointer);
      destructor Destroy; override;
  
***************
*** 80,84 ****
  
    public
!     constructor Create;
  
      procedure CloseFile; override;
--- 81,85 ----
  
    public
!     constructor Create(ADbfFile: pointer);
  
      procedure CloseFile; override;
***************
*** 95,99 ****
  
  uses
!   SysUtils;
  
  //====================================================================
--- 96,100 ----
  
  uses
!   SysUtils, Dbf_DbfFile;
  
  //====================================================================
***************
*** 131,135 ****
  //============ Dbtfile
  //==========================================================
! constructor TMemoFile.Create;
  begin
    // init vars
--- 132,136 ----
  //============ Dbtfile
  //==========================================================
! constructor TMemoFile.Create(ADbfFile: pointer);
  begin
    // init vars
***************
*** 138,142 ****
  
    // call inherited
!   inherited;
  end;
  
--- 139,146 ----
  
    // call inherited
!   inherited Create;
! 
!   FDbfFile := ADbfFile;
!   FTempMode := TDbfFile(ADbfFile).TempMode;
  end;
  
***************
*** 479,483 ****
  // ------------------------------------------------------------------
  
! constructor TNullMemoFile.Create;
  begin
    inherited;
--- 483,487 ----
  // ------------------------------------------------------------------
  
! constructor TNullMemoFile.Create(ADbfFile: pointer);
  begin
    inherited;