Changeset 1601

Timestamp:

07/17/04 22:37:27 (20 years ago)

Author:

jalet

Message:

Missing file... Am I really stupid ?

Location:

pykota/trunk

Files:

• bin/lprngpykota (added)
• pykota/storages/ldapstorage.py (modified) (3 diffs)
• pykota/tool.py (modified) (3 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.73  2004/07/17 20:37:27  jalet
+# Missing file... Am I really stupid ?
+#
 # Revision 1.72  2004/07/01 19:56:43  jalet
 # Better dispatching of error messages
@@ -637 +640 @@
                 lastjob.UserName = fields.get("pykotaUserName")[0]
                 lastjob.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter", [0])[0] or 0)
-                lastjob.JobSize = int(fields.get("pykotaJobSize", [0])[0])
-                lastjob.JobPrice = float(fields.get("pykotaJobPrice", [0.0])[0])
+                try :
+                    lastjob.JobSize = int(fields.get("pykotaJobSize", [0])[0])
+                except ValueError :    
+                    lastjob.JobSize = None
+                try :    
+                    lastjob.JobPrice = float(fields.get("pykotaJobPrice", [0.0])[0])
+                except ValueError :    
+                    lastjob.JobPrice = None
                 lastjob.JobAction = fields.get("pykotaAction", [""])[0]
                 lastjob.JobFileName = fields.get("pykotaFileName", [""])[0]
@@ -1101 +1110 @@
                 job.JobId = fields.get("pykotaJobId")[0]
                 job.PrinterPageCounter = int(fields.get("pykotaPrinterPageCounter", [0])[0] or 0)
-                job.JobSize = int(fields.get("pykotaJobSize", [0])[0])
-                job.JobPrice = float(fields.get("pykotaJobPrice", [0.0])[0])
+                try :
+                    job.JobSize = int(fields.get("pykotaJobSize", [0])[0])
+                except ValueError :    
+                    job.JobSize = None
+                try :    
+                    job.JobPrice = float(fields.get("pykotaJobPrice", [0.0])[0])
+                except ValueError :
+                    job.JobPrice = None
                 job.JobAction = fields.get("pykotaAction", [""])[0]
                 job.JobFileName = fields.get("pykotaFileName", [""])[0]

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.113  2004/07/17 20:37:27  jalet
+# Missing file... Am I really stupid ?
+#
 # Revision 1.112  2004/07/16 12:22:47  jalet
 # LPRng support early version
@@ -918 +921 @@
          self.options, \
          self.originalbackend) = self.extractInfoFromCupsOrLprng()
+         
+        self.logdebug(_("Printing system %s, args=%s") % (str(self.printingsystem), " ".join(sys.argv)))
+        
         self.username = self.username or 'root' # when printing test page from CUPS web interface, username is empty
         if self.config.getUserNameToLower() :
@@ -1113 +1119 @@
                 rseen = "localhost"
             try :    
-                df_name = [line[8:] for line in os.environ.get("HF").split() if line.startswith("df_name=")][0]
+                df_name = [line[8:] for line in os.environ.get("HF", "").split() if line.startswith("df_name=")][0]
             except IndexError :
                 inputfile = None