Commit emails of the iDok project

["Apache" <apache AT savannah.psi.ch>]

Author: huebner AT PSI.CH
Date: Wed Apr 30 16:33:05 2008
New Revision: 79

Log:
changed to use OOodaemon and Open Office 3.4 without the need for Xvfb

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 Apr 30 16:33:05 2008
@@ -368,8 +368,8 @@
             }
             if (soffice != null) {
                 // Kill soffice if it is already running
-                soffice.destroy();
-                soffice = null;
+//                soffice.destroy();
+//                soffice = null;
             }
 
             if (procBuilder == null) {
@@ -398,8 +398,7 @@
                 procBuilder = new ProcessBuilder("bash", "-c",
                         "soffice -accept='socket,host=localhost,port="
                                 + unoPort
-                                + ";urp;' -headless -invisible -display "
-                                + screen);
+                                + ";urp;' -headless -invisible 
-nofirststartwizard -nologo");
                 procBuilder = procBuilder.redirectErrorStream(true);
                 procBuilder = procBuilder.directory(new File(tmpDir));
             }
@@ -418,7 +417,7 @@
                 try {
                     // start open office
                     if (soffice == null)
-                        soffice = procBuilder.start();
+//                        soffice = procBuilder.start();
                     unoObj = urlResolver
                             .resolve("uno:socket,host=localhost,port="
                                     + unoPort
@@ -449,8 +448,8 @@
                             } else {
                                 logger.warning("OpenOffice terminated\n" + 
sb);
                             }
-                            soffice.destroy();
-                            soffice = null;
+//                            soffice.destroy();
+//                            soffice = null;
                         } catch (IllegalThreadStateException tsex) {
                             // soffice has not terminated yet, as it should 
not
                         } finally {
@@ -459,8 +458,8 @@
                         }
                     } // if (soffic != null)
                 } finally {
-                    if (soffice != null)
-                        soffice.getOutputStream().close();
+//                    if (soffice != null)
+//                        soffice.getOutputStream().close();
                 }
             }
             if (unoObj == null)