[dbfpy-checkins] dbfpy/dbfpy dbfnew.py,1.3,1.4

[alexander s. <a1...@us...>]

Update of /cvsroot/dbfpy/dbfpy/dbfpy
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20380

Modified Files:
	dbfnew.py 
Log Message:
added export declaration;
updated for dbfpy 2.0

Index: dbfnew.py
===================================================================
RCS file: /cvsroot/dbfpy/dbfpy/dbfpy/dbfnew.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dbfnew.py	14 Dec 2005 23:47:45 -0000	1.3
--- dbfnew.py	4 Jul 2006 08:18:18 -0000	1.4
***************
*** 1,12 ****
  #!/usr/bin/python
- 
  """.DBF creation helpers.
  
  TODO:
    - handle Memo fields.
    - check length of the fields accoring to the
      `http://www.clicketyclick.dk/databases/xbase/format/data_types.html`
  """
  """History (most recent first)
  15-dec-2005 [yc]    define dbf_new.__slots__
  14-dec-2005 [yc]    added vim modeline; retab'd; added doc-strings;
--- 1,17 ----
  #!/usr/bin/python
  """.DBF creation helpers.
  
+ Note: this is a legacy interface.  New code should use Dbf class
+     for table creation (see examples in dbf.py)
+ 
  TODO:
    - handle Memo fields.
    - check length of the fields accoring to the
      `http://www.clicketyclick.dk/databases/xbase/format/data_types.html`
+ 
  """
  """History (most recent first)
+ 04-jul-2006 [als]   added export declaration;
+                     updated for dbfpy 2.0
  15-dec-2005 [yc]    define dbf_new.__slots__
  14-dec-2005 [yc]    added vim modeline; retab'd; added doc-strings;
***************
*** 18,23 ****
  __date__ = "$Date$"[7:-2]
  
! from dbf import *
  
  
  class _FieldDefinition(object):
--- 23,32 ----
  __date__ = "$Date$"[7:-2]
  
! __all__ = ["dbf_new"]
  
+ from dbf import *
+ from fields import *
+ from header import *
+ from record import *
  
  class _FieldDefinition(object):
***************
*** 65,73 ****
      def getDbfField(self):
          "Return `DbfFieldDef` instance from the current definition."
!         _rv = self.cls()
!         _rv.length = self.len
!         _rv.decimalCount = self.dec
!         _rv.name = self.name
!         return _rv
  
      def appendToHeader(self, dbfh):
--- 74,78 ----
      def getDbfField(self):
          "Return `DbfFieldDef` instance from the current definition."
!         return self.cls(self.name, self.len, self.dec)
  
      def appendToHeader(self, dbfh):
***************
*** 79,84 ****
          """
          _dbff = self.getDbfField()
!         dbfh.addFieldDef(_dbff)
!         dbfh.recordLength += _dbff.length
  
  
--- 84,88 ----
          """
          _dbff = self.getDbfField()
!         dbfh.addField(_dbff)
  
  
***************
*** 136,143 ****
          for _fldDef in self.fields:
              _fldDef.appendToHeader(_dbfh)
-         _dbfh.recordLength += 1
-         _dbfh.headerLength = 32 + (32 * len(_dbfh.fieldNames)) + 1
          _dbfStream = file(filename, "wb")
!         _dbfh.writeOn(_dbfStream)
          _dbfStream.close()
  
--- 140,145 ----
          for _fldDef in self.fields:
              _fldDef.appendToHeader(_dbfh)
          _dbfStream = file(filename, "wb")
!         _dbfh.write(_dbfStream)
          _dbfStream.close()
  
***************
*** 152,158 ****
      # test new dbf
      print "*** created tst.dbf: ***"
!     dbft = Dbf()
!     dbft.openFile('tst.dbf', readOnly=0)
!     dbft.reportOn()
      # add a record
      rec=DbfRecord(dbft)
--- 154,159 ----
      # test new dbf
      print "*** created tst.dbf: ***"
!     dbft = Dbf('tst.dbf', readOnly=0)
!     print repr(dbft)
      # add a record
      rec=DbfRecord(dbft)
***************
*** 170,177 ****
      # show the records
      print "*** inserted 2 records into tst.dbf: ***"
!     dbft.reportOn()
      for i1 in range(len(dbft)):
          rec = dbft[i1]
!         for fldName in dbft.fieldNames():
              print '%s:\t %s'%(fldName, rec[fldName])
          print
--- 171,178 ----
      # show the records
      print "*** inserted 2 records into tst.dbf: ***"
!     print repr(dbft)
      for i1 in range(len(dbft)):
          rec = dbft[i1]
!         for fldName in dbft.fieldNames:
              print '%s:\t %s'%(fldName, rec[fldName])
          print