Changeset 1483 for pykota/trunk/pykota/accounters/software.py

Timestamp:

05/18/04 16:49:34 (20 years ago)

Author:

jalet

Message:

Big code changes to completely remove the need for "requester" directives,
jsut use "hardware(... your previous requester directive's content ...)"

Files:

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

pykota/trunk/pykota/accounters/software.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.2  2004/05/18 14:49:23  jalet
+# Big code changes to completely remove the need for "requester" directives,
+# jsut use "hardware(... your previous requester directive's content ...)"
+#
 # Revision 1.1  2004/05/13 13:59:30  jalet
 # Code simplifications
@@ -45 +49 @@
             infile = open(self.filter.inputfile, "rb")
             
-        # launches external accounter
+        # launches software accounter
         # TODO : USE tempfile.mkstemp() instead ! Needs some work !
         infilename = tempfile.mktemp()
@@ -68 +72 @@
             # check exit status
             if (os.WIFEXITED(retcode) and not os.WEXITSTATUS(retcode)) or os.stat(errfilename) :
-                # tries to extract the job size from the external accounter's
+                # tries to extract the job size from the software accounter's
                 # standard output
                 childoutput = open(outfilename, "r")
@@ -74 +78 @@
                     pagecount = int(childoutput.readline().strip())
                 except (AttributeError, ValueError) :
-                    self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % self.arguments)
+                    self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
                     pagecount = 0
                 childoutput.close()    
             else :
-                self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % self.arguments)
+                self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % self.arguments)
                 pagecount = 0
             os.remove(infilename)
@@ -86 +90 @@
             # TODO : temporary files may remain on the filesystem...
             msg = "%s : %s" % (self.arguments, msg) 
-            self.filter.logger.log_message(_("Unable to compute job size with external accounter %s") % msg)
+            self.filter.logger.log_message(_("Unable to compute job size with accounter %s") % msg)
             pagecount = 0