r5023 - trunk/gnue-common/src/datasources/drivers/appserver/appserver

[reinhard]

Author: reinhard
Date: 2004-01-05 09:10:15 -0600 (Mon, 05 Jan 2004)
New Revision: 5023

Modified:
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
Log:
Some fixes for Appserver's DBdriver.


Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-01-04 19:16:34 UTC (rev 5022)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2004-01-05 15:10:15 UTC (rev 5023)
@@ -101,6 +101,9 @@
 
     self._updateCursor = Appserver_UpdateCursor(self)
 
+    # We have no separate native object
+    self.native = self
+
   def cursor(self):
     return self._updateCursor
 
@@ -111,13 +114,13 @@
   def call(self,classname,obj_id_list,methodname,parameters):
     self._sm.call(self._sess_id,classname,obj_id_list,methodname,parameters)
 
-  def commit(self,classname):
-    self._updateCursor.execute(classname)
-    self._sm.commit(self._sess_id)
+  def commit (self):
+    self._updateCursor.execute ()
+    self._sm.commit (self._sess_id)
 
-  def rollback(self,classname):
-    self._updateCursor.revert(classname)
-    self._sm.rollback(self._sess_id)
+  def rollback (self):
+    self._updateCursor.revert ()
+    self._sm.rollback (self._sess_id)
 
   def close(self,commit):
     self._sm.close(self._sess_id,commit)
@@ -253,13 +256,13 @@
       s = ''
     return s
 
-  def execute (self, classname):
-    if self._deleteList.has_key (classname): 
+  def execute (self):
+    for classname in self._deleteList.keys ():
       self._dataCon._sm.delete (self._dataCon._sess_id, classname,
                                 self._deleteList [classname])
       del self._deleteList [classname]
 
-    if self._updateList.has_key (classname):
+    for classname in self._updateList.keys ():
       while len (self._updateList [classname]):
         id = self._updateKeyList[classname].pop()
         dict = self._updateList[classname].pop()
@@ -271,9 +274,9 @@
       del self._updateList [classname]
       del self._updateKeyList [classname]
 
-  def revert (self, classname):
-    if self._deleteList.has_key (classname):
+  def revert (self):
+    for classname in self._deleteList.keys ():
       del self._deleteList [classname]
-    if self._updateList.has_key (classname):
+    for classname in self._updateList.keys ():
       del self._updateList [classname]
       del self._updateKeyList [classname]

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2004-01-04 19:16:34 UTC (rev 5022)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2004-01-05 15:10:15 UTC (rev 5023)
@@ -97,8 +97,8 @@
       raise Exceptions.ConnectionError, err
 
     try:
-      listcursor = 
self._dataConnection.request(self.table,filter,sort,fieldlist,\
-                                                self._dataObject._unicodeMode)
+      listcursor = self._connection.request (self.table, filter, sort,
+                                             fieldlist, self._unicodeMode)
     except Exception, msg:
       tmsg = _("Error during creation of object list \n\n --- %s ---)") % msg
       raise Exceptions.ConnectionError, tmsg