Changeset 2651

Timestamp:

02/08/06 13:22:50 (18 years ago)

Author:

jerome

Message:

Cleaned the code a bit. Now more similar to LDAP code, this
will help later on.

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (1 diff)

pykota/trunk/pykota/storages/sql.py

@@ -135 +135 @@
         return self.prepareRawResult(result)
             
-    def getAllUsersNames(self) :    
+    def filterNames(self, records, attribute, patterns=None) :
+        """Returns a list of 'attribute' from a list of records.
+        
+           Logs any missing attribute.
+        """   
+        result = []
+        for record in records :
+            attrval = record.get(attribute, [None])
+            if attrval is None :
+                self.tool.printInfo("Object %s has no %s attribute !" % (repr(record), attribute), "error")
+            else :
+                if patterns :
+                    if (not isinstance(patterns, type([]))) and (not isinstance(patterns, type(()))) :
+                        patterns = [ patterns ]
+                    patterns = [self.userCharsetToDatabase(p) for p in patterns]
+                    if self.tool.matchString(attrval, patterns) :
+                        result.append(attrval)
+                else :    
+                    result.append(attrval)
+        return result   
+                
+    def getAllBillingCodes(self, billingcode=None) :    
+        """Extracts all billing codes or only the billing codes matching the optional parameter."""
+        result = self.doSearch("SELECT billingcode FROM billingcodes")
+        if result :
+            return self.filterNames(result, "billingcode", billingcode)
+        else :    
+            return []
+        
+    def getAllPrintersNames(self, printername=None) :    
+        """Extracts all printer names or only the printers' names matching the optional parameter."""
+        result = self.doSearch("SELECT printername FROM printers")
+        if result :
+            return self.filterNames(result, "printername", printername)
+        else :    
+            return []
+    
+    def getAllUsersNames(self, username=None) :    
         """Extracts all user names."""
-        usernames = []
         result = self.doSearch("SELECT username FROM users")
         if result :
-            usernames = [record["username"] for record in result]
-        return usernames
-        
-    def getAllGroupsNames(self) :    
+            return self.filterNames(result, "username", username)
+        else :    
+            return []
+        
+    def getAllGroupsNames(self, groupname=None) :    
         """Extracts all group names."""
-        groupnames = []
         result = self.doSearch("SELECT groupname FROM groups")
         if result :
-            groupnames = [record["groupname"] for record in result]
-        return groupnames
+            return self.filterNames(result, "groupname", groupname)
+        else :
+            return []
         
     def getUserNbJobsFromHistory(self, user) :