[gnue] r7784 - trunk/gnue-common/src/datasources/drivers/other

[reinhard]

Author: reinhard
Date: 2005-08-04 13:35:28 -0500 (Thu, 04 Aug 2005)
New Revision: 7784

Modified:
   trunk/gnue-common/src/datasources/drivers/other/appserver.py
Log:
Cleanup, docstrings, comments.


Modified: trunk/gnue-common/src/datasources/drivers/other/appserver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/other/appserver.py        
2005-08-04 18:27:53 UTC (rev 7783)
+++ trunk/gnue-common/src/datasources/drivers/other/appserver.py        
2005-08-04 18:35:28 UTC (rev 7784)
@@ -25,6 +25,8 @@
 Database driver plugin for GNU Enterprise Application Server backends.
 """
 
+__all__ = ['DriverInfo', 'Behavior', 'ResultSet', 'Connection']
+
 import sys
 
 from gnue.common.apps import errors, i18n
@@ -327,71 +329,6 @@
 
 
   # ---------------------------------------------------------------------------
-  # Create/return a connection to the appserver
-  # ---------------------------------------------------------------------------
-
-  def __getSessionManager (self):
-
-    if self.__server is None:
-      params = {'host'     : self.parameters.get ('host'),
-                'port'     : self.parameters.get ('port'),
-                'transport': self.parameters.get ('transport')}
-      rpcType = self.parameters.get ('rpctype')
-      self.__server = client.attach (rpcType, params)
-
-      if self.parameters.has_key ('timeout'):
-        self.__server.setTimeout (float (self.parameters ['timeout']))
-
-    if self._sm is None:
-      self._sm = self.__server.request ('Session')
-
-    return self._sm
-
-
-  # ---------------------------------------------------------------------------
-  # Update the given filter values
-  # ---------------------------------------------------------------------------
-
-  def __updateFilters (self, connectData):
-
-    if connectData.get ('_username') == 'foobar':
-      raise Exceptions.LoginError, "What a silly username ..."
-
-    for item in self.__filters:
-      (filterId, filterLabel) = item [0]
-
-      if connectData.has_key (filterId):
-        value = connectData [filterId]
-        (label, search, field) = item [1][0]
-
-        # if there are no filter values we've to skip replacement. Maybe the
-        # user just wants to add new filter values
-        if not len (item [3].keys ()):
-          continue
-
-        if item [2] is None:
-          masterkey = None
-        else:
-          masterkey = connectData [item [2]]
-
-        found = False
-        vDict = item [3][masterkey]
-        for record in vDict:
-          # The supplied value of a filter might could be the description or
-          # the gnue_id.
-          if record [field] == value or record ['gnue_id'] == value:
-            connectData [filterId] = record [u'gnue_id']
-            found = True
-            break
-
-        if not found:
-          raise Exceptions.LoginError, \
-              u_("'%(value)s' is not a valid filter-value for '%(filter)s'") \
-              % {'value': value,
-                 'filter': label}
-
-
-  # ---------------------------------------------------------------------------
   # Implementations of virtual methods
   # ---------------------------------------------------------------------------
 
@@ -459,6 +396,43 @@
 
   # ---------------------------------------------------------------------------
 
+  def __updateFilters (self, connectData):
+
+    for item in self.__filters:
+      (filterId, filterLabel) = item [0]
+
+      if connectData.has_key (filterId):
+        value = connectData [filterId]
+        (label, search, field) = item [1][0]
+
+        # if there are no filter values we've to skip replacement. Maybe the
+        # user just wants to add new filter values
+        if not len (item [3].keys ()):
+          continue
+
+        if item [2] is None:
+          masterkey = None
+        else:
+          masterkey = connectData [item [2]]
+
+        found = False
+        vDict = item [3][masterkey]
+        for record in vDict:
+          # The supplied value of a filter might could be the description or
+          # the gnue_id.
+          if record [field] == value or record ['gnue_id'] == value:
+            connectData [filterId] = record [u'gnue_id']
+            found = True
+            break
+
+        if not found:
+          raise Exceptions.LoginError, \
+              u_("'%(value)s' is not a valid filter-value for '%(filter)s'") \
+              % {'value': value,
+                 'filter': label}
+
+  # ---------------------------------------------------------------------------
+
   def _initialize_ (self, table, fields):
     id = self._sm.store (self._sess_id, table, [None], [], [[]]) [0]
     return self.requery (table, {u'gnue_id': id}, fields)
@@ -519,3 +493,25 @@
   def _close_ (self):
     if self._sm is not None:
       self._sm.close (self._sess_id, False)
+
+
+  # ---------------------------------------------------------------------------
+  # Create/return a connection to the appserver
+  # ---------------------------------------------------------------------------
+
+  def __getSessionManager (self):
+
+    if self.__server is None:
+      params = {'host'     : self.parameters.get ('host'),
+                'port'     : self.parameters.get ('port'),
+                'transport': self.parameters.get ('transport')}
+      rpcType = self.parameters.get ('rpctype')
+      self.__server = client.attach (rpcType, params)
+
+      if self.parameters.has_key ('timeout'):
+        self.__server.setTimeout (float (self.parameters ['timeout']))
+
+    if self._sm is None:
+      self._sm = self.__server.request ('Session')
+
+    return self._sm