Changeset 527 for pkpgcounter/trunk/pkpgpdls/mscrap.py

Timestamp:

11/28/07 18:28:30 (16 years ago)

Author:

jerome

Message:

Now the presence of executable dependencies is tested at runtime.

Files:

• pkpgcounter/trunk/pkpgpdls/mscrap.py (modified) (2 diffs)

pkpgcounter/trunk/pkpgpdls/mscrap.py

@@ -32 +32 @@
     """A parser for that MS crap thing."""
     totiffcommands = [ 'xvfb-run -a abiword --import-extension=.doc --print="| gs -sDEVICE=tiff24nc -dPARANOIDSAFER -dNOPAUSE -dBATCH -dQUIET -r\"%(dpi)i\" -sOutputFile=\"%(outfname)s\" -" "%(infname)s"' ]
+    required = [ "xvfb-run", "xauth", "abiword", "gs" ]
     def isValid(self) :    
         """Returns True if data is MS crap, else False.
@@ -46 +47 @@
            or self.firstblock[2112:].startswith("MSWordDoc") :
             self.logdebug("DEBUG: Input file seems to be in a Microsoft shitty file format.")
-            return True
+            # Here we do the missing test because all commands will be needed even in page counting mode
+            if self.isMissing(self.required) :
+                return False
+            else :    
+                return True
         else :    
             return False