Changeset 24687 for gs2-extensions

Timestamp:

2011-09-28T19:56:37+13:00 (13 years ago)

Author:

ak19

Message:

If soffice is not installed, then the OpenOfficeConverter's attempt to start soffice in the BEGIN statement fails with a popup generated by Windows that it couldn't find soffice. Before trying to run start soffice on Windows, the code now runs a which soffice command to determine that it is installed.

File:

• gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm (modified) (3 diffs)

gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

@@ -64 +64 @@
         # test to see if soffice is in path     
         my $cmd = "soffice -headless 2>&1"; # for linux and mac
+        my $status = 0;
 
         # The port that jodconverter uses to connect to soffice.
@@ -96 +97 @@
         # tends to hang, waiting for the prompt to return after OO has been started up
         # (which doesn't happen, so need to Ctrl-C GLI and run it again for it to work).
-        $cmd = "start \"soffice process\" soffice \"-accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\" -headless 2>&1";
-        $cmd .= " >nul";
-        #print STDERR "***** Tried to start-up OpenOffice with:\n$cmd\n";
+        
+        # first need to silently check soffice exists else windows will display a popup
+        $status = system("which soffice >nul 2>&1"); # which.exe should be in bin/windows
+        if ($status == 0) {
+            $cmd = "start \"soffice process\" soffice \"-accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\" -headless 2>&1";
+            $cmd .= " >nul";
+            #print STDERR "***** Tried to start-up OpenOffice with:\n$cmd\n";           
+        }
+        # else cmd is still undefined
         }
         else {
@@ -109 +116 @@
         }
         
-        my $status = system($cmd);
+        $status = system($cmd) if ($status == 0);
         if ($status != 0) {
         #print STDERR "Failed to run: $cmd\n";