Changeset 411

Timestamp:

09/14/06 13:40:13 (18 years ago)

Author:

jerome

Message:

Improved robustness

Files:

• pkpgcounter/trunk/pkpgpdls/analyzer.py (modified) (3 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -63 +63 @@
         self.openFile()
         try :
-            pdlhandler = self.detectPDLHandler()
-        except pdlparser.PDLParserError, msg :    
+            try :
+                pdlhandler = self.detectPDLHandler()
+                size = pdlhandler.getJobSize()
+            except pdlparser.PDLParserError, msg :    
+                raise pdlparser.PDLParserError, "Unknown file format for %s (%s)" % (self.filename, msg)
+        finally :    
             self.closeFile()
-            raise pdlparser.PDLParserError, "Unknown file format for %s (%s)" % (self.filename, msg)
-        else :
-            try :
-                size = pdlhandler.getJobSize()
-            finally :    
-                self.closeFile()
         return size
             
@@ -83 +81 @@
         self.openFile()
         try :
-            pdlhandler = self.detectPDLHandler()
-        except pdlparser.PDLParserError, msg :    
-            self.closeFile()
-            raise pdlparser.PDLParserError, "Unknown file format for %s (%s)" % (self.filename, msg)
-        else :
             try :
+                pdlhandler = self.detectPDLHandler()
                 tiffname = self.convertToTiffMultiPage24NC(pdlhandler)
                 result = inkcoverage.getInkCoverage(tiffname, cspace)
@@ -95 +89 @@
                 except OSError :
                     sys.stderr.write("Problem when trying to remove temporary file %s\n" % tiffname)
-            finally :    
-                self.closeFile()
+            except pdlparser.PDLParserError, msg :    
+                raise pdlparser.PDLParserError, "Unknown file format for %s (%s)" % (self.filename, msg)
+        finally :    
+            self.closeFile()
         return result