[gnue] r7302 - in trunk/gnue-common/src/datasources/drivers: Base DBSIG2

[reinhard]

Author: reinhard
Date: 2005-04-06 13:14:00 -0500 (Wed, 06 Apr 2005)
New Revision: 7302

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
Log:
Moved ResultSet._cursor attribute from Base to DBSIG2 driver. Other drivers
derived from Base don't necessarily have the concept of a cursor.


Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-06 
14:24:00 UTC (rev 7301)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-06 
18:14:00 UTC (rev 7302)
@@ -41,10 +41,8 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, dataObject, cursor = None, defaultValues = {},
-                masterRecordSet = None):
+  def __init__ (self, dataObject, defaultValues = {}, masterRecordSet = None):
      self._dataObject = dataObject
-     self._cursor = cursor
      self._cachedRecords = []
      self._currentRecord = -1
      self._masterRecordSet = masterRecordSet

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py       
2005-04-06 14:24:00 UTC (rev 7301)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py       
2005-04-06 18:14:00 UTC (rev 7302)
@@ -41,14 +41,15 @@
 
 class ResultSet(BaseResultSet):
 
-  def __init__(self, *args, **parms):
-    try:
-      self._fieldOrder = parms['fieldOrder']
-      del parms['fieldOrder']
-    except KeyError:
-      self._fieldOrder = []
-    BaseResultSet.__init__(self, *args, **parms)
+  def __init__(self, dataObject, cursor = None, defaultValues = {},
+               masterRecordSet = None, fieldOrder = []):
 
+    BaseResultSet.__init__(self, dataObject, defaultValues = defaultValues,
+                           masterRecordSet = masterRecordSet)
+
+    self._cursor = cursor
+    self._fieldOrder = fieldOrder
+
     self._fieldNames = []
 
     if self._cursor: