gnue/gnue-common/src GDataObjects.py dbdrivers/...

[James Thompson]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 01/08/30 15:28:27

Modified files:
        gnue-common/src: GDataObjects.py 
        gnue-common/src/dbdrivers/_dbsig: DBdriver.py 
        gnue-common/src/dbdrivers/_empty: DBdriver.py 
        gnue-common/src/dbdrivers/_static: DBdriver.py 
        gnue-common/src/dbdrivers/empty: DBdriver.py 
        gnue-common/src/dbdrivers/geas: DBdriver.py 

Log message:
        (jcater) fixes to master/detail auto-populate

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/GDataObjects.py.diff?cvsroot=OldCVS&tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/_static/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/empty/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/dbdrivers/geas/DBdriver.py.diff?cvsroot=OldCVS&tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnue/gnue-common/src/GDataObjects.py
diff -u gnue/gnue-common/src/GDataObjects.py:1.11 
gnue/gnue-common/src/GDataObjects.py:1.12
--- gnue/gnue-common/src/GDataObjects.py:1.11   Thu Aug 30 14:57:47 2001
+++ gnue/gnue-common/src/GDataObjects.py        Thu Aug 30 15:28:27 2001
@@ -104,20 +104,21 @@
     return self._masterObject != None
 
   # Do not over-ride by vendor code
-  def createResultSet(self, conditions={}, readOnly=0):
-    return self._createResultSet(conditions, readOnly)
+  def createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None):
+    return self._createResultSet(conditions, readOnly=readOnly, 
masterRecordSet=masterRecordSet)
 
   # Designed to be replaced by vendor-specific code
-  def _createResultSet(self, conditions={}, readOnly=0):
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None):
     pass
 
   # Do not over-ride by vendor code
-  def createEmptyResultSet(self, readOnly=0):
-    return self._createEmptyResultSet(readOnly)
+  def createEmptyResultSet(self, readOnly=0, masterRecordSet=None):
+    return self._createEmptyResultSet(readOnly, masterRecordSet)
 
   # Designed to be replaced by vendor-specific code
-  def _createEmptyResultSet(self, readOnly=0):
-    return self.createResultSet(conditions={'1':2}, readOnly=readOnly)
+  def _createEmptyResultSet(self, readOnly=0, masterRecordSet=None):
+    return self.createResultSet(conditions={'1':2}, readOnly=readOnly, 
+                                masterRecordSet=masterRecordSet)
 
 
   # Add a detail data object.  This dataobject will create a new resultset
@@ -214,7 +215,7 @@
             master.current.getField(string.strip(self._masterfields[i]))
         GDebug.printMesg(10,master.current.getField(self._masterfields[i]))
       master.current._cachedDetailResultSets[self] = \
-          self.createResultSet(conditions=criteria)
+          self.createResultSet(conditions=criteria, 
masterRecordSet=master.current)
     return master.current._cachedDetailResultSets[self]
 
 
@@ -350,11 +351,16 @@
       self._currentRecord = self._currentRecord+1
       self._cachedRecords.insert(self._currentRecord, 
self._createEmptyRecord())
       self.current = self._cachedRecords[self._currentRecord]
-      if self._masterRecordSet != None and has_attr(self._dataObject, 
'_masterfields'):
+      print "inserting a record!!!!"
+      if self._masterRecordSet != None and hasattr(self._dataObject, 
'_masterfields'):
+        i = 0
         for field in self._dataObject._masterfields:
           # We will not call setField because we don't wan't want 
auto-populated
           # fields to report the record as pending a post.
-          self.current._fields[field] = self._masterRecordSet.getField(field)
+          print "Setting %s to %s" % (field, 
self._masterRecordSet.getField(field))
+          self.current._fields[self._dataObject._detailfields[i]] = \
+             self._masterRecordSet.getField(field)
+          i = i + 1
 
       self.notifyDetailObjects()
       return 1
Index: gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.12 
gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.13
--- gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py:1.12      Thu Aug 30 
14:34:48 2001
+++ gnue/gnue-common/src/dbdrivers/_dbsig/DBdriver.py   Thu Aug 30 15:28:27 2001
@@ -230,13 +230,13 @@
     return [['_username', 'User Name',0],['_password', 'Password',1]]
 
 
-  def _createResultSet(self, conditions={}, readOnly=0): 
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None): 
     try: 
       cursor = self._dataConnection.cursor()
       cursor.execute(self._buildQuery(conditions))
     except self._DatabaseError, err: 
       raise GDataObjects.ConnectionError, err
-    rs = self._resultSetClass(self, cursor=cursor)
+    rs = self._resultSetClass(self, cursor=cursor, 
masterRecordSet=masterRecordSet)
     if readOnly: 
       rs._readonly = readOnly
     return rs
Index: gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py:1.1 
gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py:1.2
--- gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py:1.1       Thu Aug 30 
10:30:39 2001
+++ gnue/gnue-common/src/dbdrivers/_empty/DBdriver.py   Thu Aug 30 15:28:27 2001
@@ -45,8 +45,8 @@
     DataObject.__init__(self)
     self.triggerExtensions = TriggerExtensions(self)
 
-  def _createResultSet(self, conditions={}, readOnly=0): 
-    return NIL_ResultSet(self)
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None): 
+    return NIL_ResultSet(self, masterRecordSet=masterRecordSet)
 
   # We don't do logins
   def getLoginFields(self): 
@@ -100,8 +100,8 @@
 
 
   # Create an empty record
-  def _createEmptyRecord(self): 
-    return self._recordSetClass(self)
+  def _createEmptyRecord(self, masterRecordSet=None): 
+    return self._recordSetClass(self, masterRecordSet=masterRecordSet)
 
 
 ###########################################################
Index: gnue/gnue-common/src/dbdrivers/_static/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/_static/DBdriver.py:1.1 
gnue/gnue-common/src/dbdrivers/_static/DBdriver.py:1.2
--- gnue/gnue-common/src/dbdrivers/_static/DBdriver.py:1.1      Thu Aug 30 
10:30:40 2001
+++ gnue/gnue-common/src/dbdrivers/_static/DBdriver.py  Thu Aug 30 15:28:27 2001
@@ -44,8 +44,8 @@
     DataObject.__init__(self)
     self.triggerExtensions = TriggerExtensions(self)
 
-  def _createResultSet(self, conditions={}, readOnly=0): 
-    return STATIC_ResultSet(self)
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None): 
+    return STATIC_ResultSet(self, masterRecordSet=masterRecordSet)
 
   # We don't do logins
   def getLoginFields(self): 
@@ -99,8 +99,8 @@
 
 
   # Create an empty record
-  def _createEmptyRecord(self): 
-    return self._recordSetClass(self)
+  def _createEmptyRecord(self, masterRecordSet=None): 
+    return self._recordSetClass(self, masterRecordSet=masterRecordSet)
 
 
 ###########################################################
Index: gnue/gnue-common/src/dbdrivers/empty/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/empty/DBdriver.py:1.4 
gnue/gnue-common/src/dbdrivers/empty/DBdriver.py:1.5
--- gnue/gnue-common/src/dbdrivers/empty/DBdriver.py:1.4        Thu Aug 30 
10:30:40 2001
+++ gnue/gnue-common/src/dbdrivers/empty/DBdriver.py    Thu Aug 30 15:28:27 2001
@@ -47,8 +47,8 @@
     DataObject.__init__(self)
     self.triggerExtensions = TriggerExtensions(self)
 
-  def _createResultSet(self, conditions={}, readOnly=0): 
-    return NIL_ResultSet(self)
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None): 
+    return NIL_ResultSet(self, masterRecordSet=masterRecordSet)
 
   # We don't do logins
   def getLoginFields(self): 
@@ -102,8 +102,8 @@
 
 
   # Create an empty record
-  def _createEmptyRecord(self): 
-    return self._recordSetClass(self)
+  def _createEmptyRecord(self, masterRecordSet=None): 
+    return self._recordSetClass(self, masterRecordSet=masterRecordSet)
 
 
 ###########################################################
Index: gnue/gnue-common/src/dbdrivers/geas/DBdriver.py
diff -u gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.9 
gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.10
--- gnue/gnue-common/src/dbdrivers/geas/DBdriver.py:1.9 Wed Aug 29 17:23:12 2001
+++ gnue/gnue-common/src/dbdrivers/geas/DBdriver.py     Thu Aug 30 15:28:27 2001
@@ -181,13 +181,13 @@
     return [['_username', 'User Name',0],['_password', 'Password',1]]
 
 
-  def _createResultSet(self, conditions={}, readOnly=0): 
+  def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None): 
     try: 
       cursor = self._dataConnection.cursor()
       cursor.execute(self._buildQuery(conditions))
     except self._DatabaseError, err: 
       raise GDataObjects.ConnectionError, err
-    rs = self._resultSetClass(self, cursor=cursor)
+    rs = self._resultSetClass(self, cursor=cursor, masterRecordSet=None)
     if readOnly: 
       rs._readonly = readOnly
     return rs