[gnue-contrib] r250 - objectWrapper/src

[jamest]

Author: jamest
Date: 2006-11-22 13:51:20 -0600 (Wed, 22 Nov 2006)
New Revision: 250

Modified:
   objectWrapper/src/ObjectWrapper.py
Log:
now shares connection with children


Modified: objectWrapper/src/ObjectWrapper.py
===================================================================
--- objectWrapper/src/ObjectWrapper.py  2006-11-15 16:54:00 UTC (rev 249)
+++ objectWrapper/src/ObjectWrapper.py  2006-11-22 19:51:20 UTC (rev 250)
@@ -169,7 +169,7 @@
                       **fieldValues)
 
 
-  def multiLoad(self, **fieldValues):
+  def multiLoad(self, conditions = None, order_by = None, **fieldValues):
     """
     Returns a list of items with this object being the first in the list.
 
@@ -183,7 +183,8 @@
        @param fieldValues: Keyword arguments in the form of 
tableFieldName=value
        @return: None
     """
-    return self._load(multi=True, **fieldValues)
+    return self._load(multi=True, conditions=conditions, order_by=order_by, 
+                      **fieldValues)
     
             
   def _load(self, multi = False, conditions = None, order_by = None, 
@@ -238,7 +239,7 @@
       # Load any detail records
       if self._joinMulti:
         for detailVar, detailInfo in self._joinMulti.items():
-          detailInstance = detailInfo['class']()
+          detailInstance = detailInfo['class'](connections=self.connections)
 
           conditions = {detailInfo['detaillink'] : 
                         getattr(newClass, detailInfo['masterlink']),
@@ -269,7 +270,7 @@
       # Build the list
       instanceList.append(newClass)
       
-      newClass = self.__class__()
+      newClass = self.__class__(connections = self.connections)
       
     # Only returns from here on multi = True  
     return instanceList