[gnue] r8464 - trunk/gnue-appserver/src

[reinhard]

Author: reinhard
Date: 2006-05-15 07:22:37 -0500 (Mon, 15 May 2006)
New Revision: 8464

Modified:
   trunk/gnue-appserver/src/data.py
   trunk/gnue-appserver/src/geasAuthentication.py
   trunk/gnue-appserver/src/geasList.py
Log:
Changed data.resultset.count() to data.resultset.__len__().


Modified: trunk/gnue-appserver/src/data.py
===================================================================
--- trunk/gnue-appserver/src/data.py    2006-05-15 12:04:56 UTC (rev 8463)
+++ trunk/gnue-appserver/src/data.py    2006-05-15 12:22:37 UTC (rev 8464)
@@ -1240,13 +1240,13 @@
   # Return the number of records
   # ---------------------------------------------------------------------------
 
-  def count (self):
+  def __len__ (self):
     """
     This function returns the number of records in this result set.
     """
 
-    return self.__resultSet.getRecordCount () + \
-        len (self.__add) + self.__added - len (self.__remove)
+    return len (self.__resultSet) + len (self.__add) + self.__added \
+            - len (self.__remove)
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-appserver/src/geasAuthentication.py
===================================================================
--- trunk/gnue-appserver/src/geasAuthentication.py      2006-05-15 12:04:56 UTC 
(rev 8463)
+++ trunk/gnue-appserver/src/geasAuthentication.py      2006-05-15 12:22:37 UTC 
(rev 8464)
@@ -97,7 +97,7 @@
       resultSet = conn.query (contents, {u'gnue_username': user}, [])
 
       try:
-        hits = resultSet.count ()
+        hits = len (resultSet)
 
         if not hits:
           raise AuthError, u_("User '%s' does not exist.") % user

Modified: trunk/gnue-appserver/src/geasList.py
===================================================================
--- trunk/gnue-appserver/src/geasList.py        2006-05-15 12:04:56 UTC (rev 
8463)
+++ trunk/gnue-appserver/src/geasList.py        2006-05-15 12:22:37 UTC (rev 
8464)
@@ -253,7 +253,7 @@
       if self.__recordset is None:
         result = self.__length
       else:
-        result = self.__recordset.count ()
+        result = len (self.__recordset)
 
     assert gLeave (4, result)