Changeset 1068 for pykota/trunk/pykota/storages/pgstorage.py

Timestamp:

07/07/03 13:49:24 (21 years ago)

Author:

jalet

Message:

Lots of small fixes with the help of PyChecker?

Files:

• pykota/trunk/pykota/storages/pgstorage.py (modified) (3 diffs)

pykota/trunk/pykota/storages/pgstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.6  2003/07/07 11:49:24  jalet
+# Lots of small fixes with the help of PyChecker
+#
 # Revision 1.5  2003/07/07 08:33:19  jalet
 # Bug fix due to a typo in LDAP code
@@ -126 +129 @@
         except pg.error, msg :    
             raise PyKotaStorageError, msg
+        else :    
+            return result
             
     def doQuote(self, field) :
@@ -329 +334 @@
     def addUserToGroup(self, user, group) :    
         """Adds an user to a group."""
-        result = self.doModify("SELECT COUNT(*) AS mexists FROM groupsmembers WHERE groupid=%s AND userid=%s" % (self.doQuote(group.ident), self.doQuote(user.ident)))
+        result = self.doSearch("SELECT COUNT(*) AS mexists FROM groupsmembers WHERE groupid=%s AND userid=%s" % (self.doQuote(group.ident), self.doQuote(user.ident)))
         try :
-            mexists = self.doParseResult(result)[0]["mexists"]
-        except TypeError :    
+            mexists = int(result[0].get("mexists"))
+        except (IndexError, TypeError) :    
             mexists = 0
         if not mexists :