Changeset 2743 for pykota/trunk/bin/edpykota

Timestamp:

02/21/06 21:57:12 (18 years ago)

Author:

jerome

Message:

Big improvement for data extraction.

Files:

• pykota/trunk/bin/edpykota (modified) (3 diffs)

pykota/trunk/bin/edpykota

@@ -160 +160 @@
         suffix = (options["groups"] and "Group") or "User"        
         printernames = options["printer"].split(",")
+        if not names :
+            names = ["*"]
+            
+        before = time.time()
+        (printers, entries, pqentries) = getattr(self.storage, "getPrinters%ssAndPQuotas" % suffix)(printernames, names)
+        after = time.time()
+        self.printInfo("Data extraction took : %.4f seconds" % (after - before))
         
         if options["delete"] :    
             self.display("%s...\n" % _("Deletion"))
-            #printers = self.storage.getMatchingPrinters(options["printer"])
-            #entries = getattr(self.storage, "getMatching%ss" % suffix)(",".join(names))
-            before = time.time()
-            (printers, entries, pqentries) = getattr(self.storage, "getPrinters%ssAndPQuotas" % suffix)(printernames, names)
-            after = time.time()
-            self.printInfo("Data extraction took %.4f seconds" % (after - before))
             nbtotal = len(pqentries)
             for i in range(nbtotal) :
@@ -177 +178 @@
                 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"] :
@@ -319 +317 @@
                      
 if __name__ == "__main__" : 
-    try : 
-       import psyco
-       psyco.profile()
-    except :   
-       pass
     retcode = 0
     try :