[gnue] r7335 - in trunk/gnue-common/src/datasources: . drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-11 16:25:00 -0500 (Mon, 11 Apr 2005)
New Revision: 7335

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Made RecordSet._fields private.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-11 21:05:49 UTC 
(rev 7334)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-11 21:25:00 UTC 
(rev 7335)
@@ -174,7 +174,7 @@
     for count in range(recordCount):
       record = resultSet.getRecord(count)
       resultDict = {}
-      for key in record._fields.keys():
+      for key in record.keys():
         resultDict[key]=record.getField(key) or ""
       returnList.append(resultDict)
     return returnList

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-11 
21:05:49 UTC (rev 7334)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-11 
21:25:00 UTC (rev 7335)
@@ -53,9 +53,8 @@
     # The ResultSet this RecordSet is a part of - FIXME: should be private
     self._parent = parent
 
-    # The field values, keys are lowercase - FIXME: should be private, others
-    # should use getField() and setField()
-    self._fields = {}
+    # The field values, keys are lowercase
+    self.__fields = {}
 
     # If field name is present as a key, then field has been modified; keys are
     # lowercase - FIXME: should be private, others should use isFieldModified()
@@ -76,7 +75,7 @@
       # Existing record:
       # Set the current state of all fields as given in the parameter
       for (field, value) in initialData.items ():
-        self._fields [field.lower ()] = value
+        self.__fields [field.lower ()] = value
 
     else:
 
@@ -90,13 +89,13 @@
       # 2. Set all fields to None, so that the dictionary at least contains a
       #    key for every field
       for field in do._fieldReferences.keys ():
-        self._fields [field.lower ()] = None
+        self.__fields [field.lower ()] = None
 
       # 3. Get default values from driver (e.g. initialize primary keys)
       if do._connection:                # There are datasources w/o connection!
         defaults = do._connection.initialize (do.table)
         for (field, value) in defaults.items ():
-          self._fields [field.lower ()] = value
+          self.__fields [field.lower ()] = value
           # Make sure the default values are included in the insert field list
           self._modifiedFlags [field.lower ()] = True
 
@@ -106,17 +105,17 @@
       if self.__primarykeyFields:
         primarykeyIsComplete = True
         for field in self.__primarykeyFields:
-          if self._fields [field] is None:
+          if self.__fields [field] is None:
             primarykeyIsComplete = False
             break
         if primarykeyIsComplete:
-          self.__initialData = self._fields.copy ()
+          self.__initialData = self.__fields.copy ()
           self.requery ()
 
       # 5. Get default values from DataSource.  This has to be done at the very
       #    end, as these changes remain local until the first post.
       for (field, value) in defaultData.items ():
-        self._fields [field.lower ()] = value
+        self.__fields [field.lower ()] = value
         # Make sure the default values are included in the insert field list
         self._modifiedFlags [field.lower ()] = True
 
@@ -133,13 +132,13 @@
     @return: Field value.
     """
     fn = field.lower ()
-    if self._fields.has_key (fn):
-      return self._fields [fn]
+    if self.__fields.has_key (fn):
+      return self.__fields [fn]
     else:
       # FIXME: If a field value has yet to be set (either from a query or via a
-      # setField), then _fields will not contain a key for the requested field
+      # setField), then __fields will not contain a key for the requested field
       # even though the field name may still be valid.
-      # This should be changed - the _fields dictionary should be initialized
+      # This should be changed - the __fields dictionary should be initialized
       # with all valid field names.
       return None
 
@@ -151,7 +150,7 @@
 
     @return: A python dictionary of field name/value pairs.
     """
-    return self._fields.copy ()
+    return self.__fields.copy ()
 
   # ---------------------------------------------------------------------------
 
@@ -175,7 +174,7 @@
       raise Exceptions.ReadOnlyError, tmsg
     else:
       fn = field.lower ()
-      self._fields [fn] = value
+      self.__fields [fn] = value
       if trackMod:
         if self._parent.isFieldBound(field):
           self._emptyFlag = False
@@ -341,7 +340,7 @@
     newfields = do._connection.requery (do.table, self.__wherefields (),
                                         fields)
     self.__initialData.update (newfields)
-    self._fields.update (newfields)
+    self.__fields.update (newfields)
 
 
   # ---------------------------------------------------------------------------
@@ -414,12 +413,12 @@
         modifiedFields = {}
         for field in self._modifiedFlags.keys ():
           if self._parent.isFieldBound (field):
-            modifiedFields [field] = self._fields [field]
+            modifiedFields [field] = self.__fields [field]
 
         if self._insertFlag:
           rowid = do._connection.insert (do.table, modifiedFields, 
recordNumber)
           if self.__rowidField:
-            self._fields [self.__rowidField] = rowid
+            self.__fields [self.__rowidField] = rowid
             self.__initialData [self.__rowidField] = rowid
             # Requery all the fields that are important for inserting details.
             # A backend trigger could have e.g. generated a primary key.
@@ -434,7 +433,7 @@
         self._insertFlag    = False
         self._updateFlag    = False
         self._modifiedFlags = {}
-        self.__initialData   = self._fields.copy ()
+        self.__initialData   = self.__fields.copy ()
 
     # Post all detail records
     for child in (self._cachedDetailResultSets.values ()):
@@ -467,7 +466,7 @@
     ds = self._parent._dataObject._dataSource
     if ds and ds.requery:
       if self.__rowidField or self.__primarykeyFields:
-        fields = [field for field in self._fields.keys ()
+        fields = [field for field in self.__fields.keys ()
                   if self._parent.isFieldBound (field)]
         self.__requery (fields)
 
@@ -569,17 +568,17 @@
   # ---------------------------------------------------------------------------
 
   def keys (self):
-    return self._fields.keys ()
+    return self.__fields.keys ()
 
   # ---------------------------------------------------------------------------
 
   def values (self):
-    return self._fields.values ()
+    return self.__fields.values ()
 
   # ---------------------------------------------------------------------------
 
   def items (self):
-    return self._fields.items ()
+    return self.__fields.items ()
 
   # ---------------------------------------------------------------------------
   # Nice string representation

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-11 
21:05:49 UTC (rev 7334)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-11 
21:25:00 UTC (rev 7335)
@@ -442,7 +442,7 @@
     if include:
       fields = list (include)
     else:
-      fields = current._fields.keys ()
+      fields = current.keys ()
 
     # Exclude all the fields in exclude=
     for field in exclude: