Commit emails of the iDok project

["AFS account Stadler Hans Christian" <stadler_h AT savannah.psi.ch>]

Author: stadler_h
Date: Wed Oct  8 11:25:46 2008
New Revision: 273

Log:
Increased the default delay for killing MS Office Extraction Process to 10s

Modified:
   
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java

Modified: 
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
==============================================================================
--- 
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
      (original)
+++ 
trunk/java/ch/idok/dmsd/impl/extractor/microsoft/MSOfficeExtractorFactory.java
      Wed Oct  8 11:25:46 2008
@@ -65,9 +65,13 @@
     static Logger logger;
 
     /**
-     * @brief Maximum time for finishing text extraction 
+     * @brief Maximum time for finishing text extraction
+     * 
+     *  Default is 10s, can be changed using the
+     *  ch.idok.dmsd.impl.extractor.microsoft.interruptdelay
+     *  property.
      */
-    static final long interruptDelay = 3000;
+    static long interruptDelay = 10000;
     
     
     /**
@@ -331,6 +335,8 @@
         try {
             logger = config.getLogger("dmsd.impl.extractor.microsoft");
             logger.finest("Initializing extractor factory for MS Office 
Documents.");
+            interruptDelay 
=Long.parseLong(System.getProperty("ch.idok.dmsd.impl.extractor.microsoft.interruptdelay",
+                    Long.toString(interruptDelay)));
             // Register content extractor factories
             config.registerContentExtractor(getMimeType(), this);
             int docType = MSExtractorProcess.getNumDocTypes();
@@ -339,9 +345,12 @@
                         docType);
                 config.registerContentExtractor(msfac.getMimeType(), msfac);
             }
+        } catch (NumberFormatException ex) {
+            DmsException.throwIt(ErrorType.BAD_ARG, this, "Initialization 
error.",
+                    "ch.idok.dmsd.impl.extractor.microsoft.interruptdelay 
property is no long value.",
+                    ex);
         } catch (Throwable th) {
-            DmsException.throwIt(ErrorType.INTERNAL, this, "Bug detected", 
"",
-                    th);
+            DmsException.throwIt(ErrorType.INTERNAL, this, "Bug detected", 
"", th);
         }
     }