Changeset 1711

Timestamp:

09/10/04 23:32:54 (20 years ago)

Author:

jalet

Message:

Small fixes for incomplete entry intialization

Location:

pykota/trunk/pykota

Files:

• storage.py (modified) (2 diffs)
• storages/sql.py (modified) (2 diffs)

pykota/trunk/pykota/storage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.59  2004/09/10 21:32:52  jalet
+# Small fixes for incomplete entry intialization
+#
 # Revision 1.58  2004/09/02 10:09:30  jalet
 # Fixed bug in LDAP user deletion code which didn't correctly delete the user's
@@ -356 +359 @@
         """Sets the printer's prices."""
         if priceperpage is None :
-            priceperpage = self.PricePerPage
+            priceperpage = self.PricePerPage or 0.0
         else :    
             self.PricePerPage = float(priceperpage)
         if priceperjob is None :    
-            priceperjob = self.PricePerJob
+            priceperjob = self.PricePerJob or 0.0
         else :    
             self.PricePerJob = float(priceperjob)

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.44  2004/09/10 21:32:54  jalet
+# Small fixes for incomplete entry intialization
+#
 # Revision 1.43  2004/07/01 17:45:49  jalet
 # Added code to handle the description field for printers
@@ -286 +289 @@
     def addUser(self, user) :        
         """Adds a user to the quota storage, returns its id."""
-        self.doModify("INSERT INTO users (username, limitby, balance, lifetimepaid, email) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(user.Name), self.doQuote(user.LimitBy), self.doQuote(user.AccountBalance), self.doQuote(user.LifeTimePaid), self.doQuote(user.Email)))
+        self.doModify("INSERT INTO users (username, limitby, balance, lifetimepaid, email) VALUES (%s, %s, %s, %s, %s)" % (self.doQuote(user.Name), self.doQuote(user.LimitBy or 'quota'), self.doQuote(user.AccountBalance or 0.0), self.doQuote(user.LifeTimePaid or 0.0), self.doQuote(user.Email)))
         return self.getUser(user.Name)
         
     def addGroup(self, group) :        
         """Adds a group to the quota storage, returns its id."""
-        self.doModify("INSERT INTO groups (groupname, limitby) VALUES (%s, %s)" % (self.doQuote(group.Name), self.doQuote(group.LimitBy)))
+        self.doModify("INSERT INTO groups (groupname, limitby) VALUES (%s, %s)" % (self.doQuote(group.Name), self.doQuote(group.LimitBy or "quota")))
         return self.getGroup(group.Name)