Changeset 1451 for pykota/trunk/pykota/storages/sql.py

Timestamp:

05/06/04 14:37:47 (20 years ago)

Author:

jalet

Message:

pkpgcounter : comments
pkprinters : when --add is used, existing printers are now skipped.

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (4 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.38  2004/05/06 12:37:47  jalet
+# pkpgcounter : comments
+# pkprinters : when --add is used, existing printers are now skipped.
+#
 # Revision 1.37  2004/02/23 22:53:21  jalet
 # Don't retrieve data when it's not needed, to avoid database queries
@@ -63 +67 @@
             fields = result[0]
             user.ident = fields.get("id")
+            user.Name = fields.get("username", username)
             user.LimitBy = fields.get("limitby")
             user.AccountBalance = fields.get("balance")
@@ -77 +82 @@
             fields = result[0]
             group.ident = fields.get("id")
+            group.Name = fields.get("groupname", groupname)
             group.LimitBy = fields.get("limitby")
             result = self.doSearch("SELECT SUM(balance) AS balance, SUM(lifetimepaid) AS lifetimepaid FROM users WHERE id IN (SELECT userid FROM groupsmembers WHERE groupid=%s)" % self.doQuote(group.ident))
@@ -93 +99 @@
             fields = result[0]
             printer.ident = fields.get("id")
+            printer.Name = fields.get("printername", printername)
             printer.PricePerJob = fields.get("priceperjob")
             printer.PricePerPage = fields.get("priceperpage")