Changeset 2739

Timestamp:

02/21/06 17:26:04 (18 years ago)

Author:

jerome

Message:

Fixed the problem with deletion time.

Files:

• pykota/trunk/bin/edpykota (modified) (1 diff)

pykota/trunk/bin/edpykota

@@ -159 +159 @@
         suffix = (options["groups"] and "Group") or "User"        
         printernames = options["printer"].split(",")
-        if not names :
-            names = ["*"]
-        (printers, entries, pqentries) = getattr(self.storage, "getPrinters%ssAndPQuotas" % suffix)(printernames, names)
         
         if options["delete"] :    
             self.display("%s...\n" % _("Deletion"))
-            nbtotal = len(pqentries)
+            printers = self.storage.getMatchingPrinters(options["printer"])
+            entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
+            nbtotal = len(entries) * len(printers)
             i = 0
-            for (pqkey, pqentry) in pqentries.items() :
-                if pqentry.Exists :
-                    pqentry.delete()
-                i += 1    
-                percent = 100.0 * float(i) / float(nbtotal)
-                self.display("\r%.02f%%" % percent)
+            for printer in printers :
+                for entry in entries :
+                    pqentry = getattr(self.storage, "get%sPQuota" % suffix)(entry, printer)
+                    if pqentry.Exists :
+                        pqentry.delete()
+                    i += 1    
+                    percent = 100.0 * float(i) / float(nbtotal)
+                    self.display("\r%.02f%%" % percent)
         else :
+            if not names :
+                names = ["*"]
+            (printers, entries, pqentries) = getattr(self.storage, "getPrinters%ssAndPQuotas" % suffix)(printernames, names)
             skipexisting = options["skipexisting"]
             if options["add"] :