Changeset 1451 for pykota/trunk/pykota/storages

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.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (4 diffs)
• sql.py (modified) (4 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.63  2004/05/06 12:37:46  jalet
+# pkpgcounter : comments
+# pkprinters : when --add is used, existing printers are now skipped.
+#
 # Revision 1.62  2004/03/05 14:31:58  jalet
 # Improvement on strange history entries
@@ -444 +448 @@
         """Extracts user information given its name."""
         user = StorageUser(self, username)
-        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaLimitBy", self.info["usermail"]], base=self.info["userbase"])
+        result = self.doSearch("(&(objectClass=pykotaAccount)(|(pykotaUserName=%s)(%s=%s)))" % (username, self.info["userrdn"], username), ["pykotaUserName", "pykotaLimitBy", self.info["usermail"]], base=self.info["userbase"])
         if result :
             fields = result[0][1]
             user.ident = result[0][0]
+            user.Name = fields.get("pykotaUserName", [username])[0] 
             user.Email = fields.get(self.info["usermail"])
             if user.Email is not None :
@@ -478 +483 @@
         """Extracts group information given its name."""
         group = StorageGroup(self, groupname)
-        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (groupname, self.info["grouprdn"], groupname), ["pykotaLimitBy"], base=self.info["groupbase"])
+        result = self.doSearch("(&(objectClass=pykotaGroup)(|(pykotaGroupName=%s)(%s=%s)))" % (groupname, self.info["grouprdn"], groupname), ["pykotaGroupName", "pykotaLimitBy"], base=self.info["groupbase"])
         if result :
             fields = result[0][1]
             group.ident = result[0][0]
+            group.Name = fields.get("pykotaGroupName", [groupname])[0] 
             group.LimitBy = fields.get("pykotaLimitBy")
             if group.LimitBy is not None :
@@ -495 +501 @@
        
     def getPrinterFromBackend(self, printername) :        
-        """Extracts printer information given its name."""
+        """Extracts printer information given its name : returns first matching printer."""
         printer = StoragePrinter(self, printername)
-        result = self.doSearch("(&(objectClass=pykotaPrinter)(|(pykotaPrinterName=%s)(%s=%s)))" % (printername, self.info["printerrdn"], printername), ["pykotaPricePerPage", "pykotaPricePerJob", "uniqueMember"], base=self.info["printerbase"])
-        if result :
-            fields = result[0][1]
+        result = self.doSearch("(&(objectClass=pykotaPrinter)(|(pykotaPrinterName=%s)(%s=%s)))" % (printername, self.info["printerrdn"], printername), ["pykotaPrinterName", "pykotaPricePerPage", "pykotaPricePerJob", "uniqueMember"], base=self.info["printerbase"])
+        if result :
+            fields = result[0][1]       # take only first matching printer, ignore the rest
             printer.ident = result[0][0]
+            printer.Name = fields.get("pykotaPrinterName", [printername])[0] 
             printer.PricePerJob = float(fields.get("pykotaPricePerJob", [0.0])[0] or 0.0)
             printer.PricePerPage = float(fields.get("pykotaPricePerPage", [0.0])[0] or 0.0)

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")