/[thuban]/branches/WIP-pyshapelib-bramz/Thuban/Model/table.py

Diff of /branches/WIP-pyshapelib-bramz/Thuban/Model/table.py

Parent Directory | Revision Log | View Patch Patch

-revision 1389 by jonathan,
Thu Jul 10 14:53:27 2003 UTC
+revision 1662 by bh,
Wed Aug 27 13:51:01 2003 UTC
 Line 132 
 class DBFTable(TitledObject, OldTableInt
      # work because a DBF file object buffers some data
      def __init__(self, filename):
-         self.filename = filename
+         self.filename = os.path.abspath(filename)
          # Omit the extension in the title as it's not really needed and
          # it can be confusing because dbflib removes extensions and
 Line 187 
 class DBFTable(TitledObject, OldTableInt
          """
          return self.column_map.has_key(col)
-     def ReadRowAsDict(self, row):
+     def RowIdToOrdinal(self, gid):
-         """Return the entire row as a dictionary with column names as keys"""
+         """Return the row ordinal given its id
+         Since for DBFTables the row id is the row number, return the
+         value unchanged.
+         """
+         return gid
+     def RowOrdinalToId(self, num):
+         """Return the rowid for given its ordinal
+         Since for DBFTables the row id is the row number, return the
+         value unchanged.
+         """
+         return num
+     def ReadRowAsDict(self, row, row_is_ordinal = 0):
+         """Return the entire row as a dictionary with column names as keys
+         The row_is_ordinal is ignored for DBF tables because the row id
+         is always the row number.
+         """
          return self.dbf.read_record(row)
-     def ReadValue(self, row, col):
+     def ReadValue(self, row, col, row_is_ordinal = 0):
          """Return the value of the specified row and column
          The col parameter may be the index of the column or its name.
+         The row_is_ordinal is ignored for DBF tables because the row id
+         is always the row number.
          """
          return self.dbf.read_record(row)[self.column_map[col].name]
-Line 331 
 class MemoryTable(TitledObject, OldTable
+Line 354 
 class MemoryTable(TitledObject, OldTable
          """Return the number of rows in the table"""
          return len(self.data)
-     def ReadValue(self, row, col):
+     def RowIdToOrdinal(self, gid):
+         """Return the row ordinal given its id
+         Since for MemoryTables the row id is the row number, return the
+         value unchanged.
+         """
+         return gid
+     def RowOrdinalToId(self, num):
+         """Return the rowid for given its ordinal
+         Since for MemoryTables the row id is the row number, return the
+         value unchanged.
+         """
+         return num
+     def ReadValue(self, row, col, row_is_ordinal = 0):
          """Return the value of the specified row and column
          The col parameter may be the index of the column or its name.
+         The row_is_ordinal is ignored for DBF tables because the row id
+         is always the row number.
          """
          return self.data[row][self.column_map[col].index]
-     def ReadRowAsDict(self, index):
+     def ReadRowAsDict(self, index, row_is_ordinal = 0):
-         """Return the entire row as a dictionary with column names as keys"""
+         """Return the entire row as a dictionary with column names as keys
+         The row_is_ordinal is ignored for DBF tables because the row id
+         is always the row number.
+         """
          return dict([(col.name, self.data[index][col.index])
                        for col in self.columns])
-Line 465 
 def _find_dbf_column_names(names):
+Line 511 
 def _find_dbf_column_names(names):
      return name_map
- def table_to_dbf(table, filename, records = None):
+ def table_to_dbf(table, filename, rows = None):
-     """Create the dbf file filename from the table"""
+     """Create the dbf file filename from the table.
+     If rows is not None (the default) then it must be a list of row
+     indices to be saved to the file, otherwise all rows are saved.
+     """
      dbf = dbflib.create(filename)
      dbflib_fieldtypes = {FIELDTYPE_STRING: dbflib.FTString,
-Line 486 
 def table_to_dbf(table, filename, record
+Line 537 
 def table_to_dbf(table, filename, record
          dbf.add_field(name_map[col.name], dbflib_fieldtypes[col.type],
                        width, prec)
-     if records is None:
+     if rows is None:
-         records = range(table.NumRows())
+         rows = range(table.NumRows())
      recNum = 0
-     for i in records:
+     for i in rows:
          record = {}
          for key, value in table.ReadRowAsDict(i).items():
              record[name_map[key]] = value
-Line 498 
 def table_to_dbf(table, filename, record
+Line 549 
 def table_to_dbf(table, filename, record
          recNum += 1
      dbf.close()
- def table_to_csv(table, filename, records = None):
+ def table_to_csv(table, filename, rows = None):
-     """Export table to csv file."""
+     """Export table to csv file.
+     If rows is not None (the default) then it must be a list of row
+     indices to be saved to the file, otherwise all rows are saved.
+     """
      file = open(filename,"w")
      columns = table.Columns()
-Line 510 
 def table_to_csv(table, filename, record
+Line 565 
 def table_to_csv(table, filename, record
          header = header + "\n"
          file.write(header)
-         if records is None:
+         if rows is None:
-             records = range(table.NumRows())
+             rows = range(table.NumRows())
-         for i in records:
+         for i in rows:
              record = table.ReadRowAsDict(i)
              if len(record):
                  line = "%s" % record[columns[0].name]

 Legend:



Removed from v.1389
 


changed lines


 
Added in v.1662
 Legend:



Removed from v.1389
 


changed lines


 
Added in v.1662
-Removed from v.1389
+Added in v.1662

[email protected]	ViewVC Help
Powered by ViewVC 1.1.26