Changeset 700

Timestamp:

02/05/03 23:28:38 (21 years ago)

Author:

jalet

Message:

More robust storage

Location:

pykota/trunk/pykota/storages

Files:

• postgresql.py (modified) (2 diffs)
• sql.py (modified) (3 diffs)

pykota/trunk/pykota/storages/postgresql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:28:38  jalet
+# More robust storage
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -58 +61 @@
         
     def doParseResult(self, result) :
-        """Returns the result as a Python dictionnary."""
-        try :
-            return result.dictresult()[0]
-        except IndexError :    
-            return None # not found
+        """Returns the result as a list of Python mappings."""
+        if result.ntuples() > 0 :
+            return result.dictresult()
         

pykota/trunk/pykota/storages/sql.py

@@ -15 +15 @@
 #
 # $Log$
+# Revision 1.2  2003/02/05 22:28:38  jalet
+# More robust storage
+#
 # Revision 1.1  2003/02/05 21:28:17  jalet
 # Initial import into CVS
@@ -26 +29 @@
     def getUserId(self, username) :
         result = self.doQuery("SELECT id FROM users WHERE username=%s;" % self.doQuote(username))
-        return self.doParseResult(result)["id"]
+        try :
+            return self.doParseResult(result)[0]["id"]
+        except TypeError :      # Not found
+            return
             
     def getPrinterId(self, printername) :        
         result = self.doQuery("SELECT id FROM printers WHERE printername=%s;" % self.doQuote(printername))
-        return self.doParseResult(result)["id"]
+        try :
+            return self.doParseResult(result)[0]["id"]
+        except TypeError :      # Not found    
+            return
             
     def getPrinterPageCounter(self, printername) :
         result = self.doQuery("SELECT pagecounter, lastusername FROM printers WHERE printername=%s;" % self.doQuote(printername))
-        return self.doParseResult(result)
+        try :
+            return self.doParseResult(result)[0]
+        except TypeError :      # Not found
+            return
         
     def updatePrinterPageCounter(self, printername, username, pagecount) :
@@ -53 +65 @@
     def getUserPQuota(self, username, printername) :
         result = self.doQuery("SELECT pagecounter, softlimit, hardlimit, datelimit FROM userpquota WHERE userid=%s AND printerid=%s;" % (self.doQuote(self.getUserId(username)), self.doQuote(self.getPrinterId(printername))))
-        return self.doParseResult(result)
+        try :
+            return self.doParseResult(result)[0]
+        except TypeError :      # Not found    
+            return
         
     def setUserPQuota(self, username, printername, softlimit, hardlimit) :