Changeset 3357

Timestamp:

03/29/08 10:08:33 (17 years ago)

Author:

jerome

Message:

Less verbose now since some messages are now logged only at debug level.
Added a workaround for API mess.

Files:

• pykota/trunk/pykota/accounters/software.py (modified) (5 diffs)

pykota/trunk/pykota/accounters/software.py

@@ -78 +78 @@
     def withExternalScript(self) :    
         """Does software accounting through an external script."""
-        self.filter.printInfo(_("Launching SOFTWARE(%s)...") % self.arguments)
+        self.filter.logdebug(_("Launching SOFTWARE(%s)...") % self.arguments)
         pagecounter = None
         child = os.popen(self.arguments, "r")
@@ -85 +85 @@
         except (IOError, OSError), msg :    
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg)
+            self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg, "warn")
         else :    
             lines = [l.strip() for l in answer.split("\n")]
@@ -92 +92 @@
                     pagecounter = int(lines[i])
                 except (AttributeError, ValueError) :
-                    self.filter.printInfo(_("Line [%s] skipped in accounter's output. Trying again...") % lines[i])
+                    self.filter.logdebug(_("Line [%s] skipped in accounter's output. Trying again...") % lines[i])
                 else :    
                     break
@@ -102 +102 @@
         except TypeError :        
             pass # None means no error occured.
-        self.filter.printInfo(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
+        self.filter.logdebug(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
             
         if pagecounter is None :    
@@ -113 +113 @@
             
         pagecounter = pagecounter or 0    
-        if self.filter.Ticket.FileName is not None :
-            # when a filename is passed as an argument, the backend 
-            # must generate the correct number of copies.
-            pagecounter *= self.filter.Ticket.Copies
+        try :
+            if self.filter.Ticket.FileName is not None :
+                # when a filename is passed as an argument, the backend 
+                # must generate the correct number of copies.
+                pagecounter *= self.filter.Ticket.Copies
+        except AttributeError :        
+            pass # when called from pykotme. TODO : clean this mess some day.
                         
         return pagecounter