Commit emails of the iDok project

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

Author: stadler_h
Date: Wed Sep 24 17:24:23 2008
New Revision: 250

Log:
Bugfix in MS Office text extraction

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 Sep 24 17:24:23 2008
@@ -276,6 +276,8 @@
 
         /** @brief Retrieve the searchable plain text. */
         public byte[] getText() throws DmsException {
+            if (serviceManager == null)
+                initOpenOffice();
             /* if (++ooRestartCounter >= ooRestartThreshold) {
                 logger.finer("Restarting OpenOffice.");
                 initOpenOffice();
@@ -305,6 +307,8 @@
                 do {
                     try {
                         loader = (XComponentLoader) 
UnoRuntime.queryInterface(XComponentLoader.class, desktop);
+                        if (loader == null)
+                            DmsException.throwIt(ErrorType.TOOL_ACCESS, 
this, "Cannot access external extraction tool", "Unable to get OpenOffice 
loader object");
                     } catch (Throwable th) {
                         logger.fine("(Retry="+tryAgain+") Exception while 
instantiating OpenOffice loader: "+th);
                         if (! tryAgain)
@@ -313,7 +317,7 @@
                         logger.finest("Reinitializing the OpenOffice 
connection.");
                         initOpenOffice();
                     }
-                } while ((loader==null) && tryAgain);
+                } while (loader == null);
                 URI uri = tf.toURI();
                 String url = uri.getScheme() + "://" + uri.getPath();
                 PropertyValue invisible = new PropertyValue("Hidden", -1, 
true,