Changeset 1332 for pykota/trunk/pykota/storages/ldapstorage.py

Timestamp:

02/04/04 14:24:41 (20 years ago)

Author:

jalet

Message:

pkprinters can now remove printers from printers groups.

Files:

• pykota/trunk/pykota/storages/ldapstorage.py (modified) (3 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.51  2004/02/04 13:24:41  jalet
+# pkprinters can now remove printers from printers groups.
+#
 # Revision 1.50  2004/02/04 11:17:00  jalet
 # pkprinters command line tool added.
@@ -871 +874 @@
             self.doModify(pgroup.ident, fields)         
             
+    def removePrinterFromGroup(self, pgroup, printer) :
+        """Removes a printer from a printer group."""
+        try :
+            pgroup.uniqueMember.remove(printer.ident)
+        except ValueError :    
+            pass
+        else :    
+            fields = {
+                       "uniqueMember" : pgroup.uniqueMember,
+                     }  
+            self.doModify(pgroup.ident, fields)         
+            
     def retrieveHistory(self, user=None, printer=None, datelimit=None, limit=100) :    
         """Retrieves all print jobs for user on printer (or all) before date, limited to first 100 results."""
@@ -993 +1008 @@
             self.doDelete(ident)
         for parent in self.getParentPrinters(printer) :  
-            parent.uniqueMember.remove(printer.ident)
-            fields = {
-                       "uniqueMember" : parent.uniqueMember,
-                     }  
-            self.doModify(parent.ident, fields)         
+            try :
+                parent.uniqueMember.remove(printer.ident)
+            except ValueError :    
+                pass
+            else :    
+                fields = {
+                           "uniqueMember" : parent.uniqueMember,
+                         }  
+                self.doModify(parent.ident, fields)         
         self.doDelete(printer.ident)