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

Timestamp:

2011-02-22T21:36:00+13:00 (13 years ago)

Author:

ak19

Message:

First part of changes for getting OpenOffice conversion to work on a remote WINDOWS Greenstone (Linux was working already).

File:

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

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

@@ -62 +62 @@
     }
     else {
-        # test to see if soffice in in path
-        my $cmd = "soffice -headless 2>&1";
-
-
-        if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        # test to see if soffice is in path     
+        my $cmd = "soffice -headless 2>&1"; # for linux and mac
+
+        if ($ENV{'GSDLOS'} =~ m/^windows$/) {       
+        if(!defined $ENV{'SOFFICE_HOST'}) {
+            $ENV{'SOFFICE_HOST'} = "localhost";
+        }
+        if(!defined $ENV{'SOFFICE_PORT'}) {
+            $ENV{'SOFFICE_PORT'} = "8200";
+        }
+        # important to have this set when the Greenstone server 
+        # and open office is on a remote windows machine
+        if(!defined $ENV{'SOFFICE_HOME'}) {
+            $ENV{'SOFFICE_HOME'} = &util::filename_cat($ENV{'ProgramFiles'},"OpenOffice.org 3"); 
+        }
         my $ooffice_dir_guess =
-            &util::filename_cat($ENV{'ProgramFiles'},"OpenOffice.org 3",
-                    "program");
+            &util::filename_cat($ENV{'SOFFICE_HOME'},"program");
         if (-d  $ooffice_dir_guess) {
             &util::envvar_append("PATH",$ooffice_dir_guess);
         }
+
+        # for windows, when working on a remote system, want to be able to start OO if
+        # not already running. We'll use the uno socket method to do so. Else client-gli
+        # 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";
         }
         else {
@@ -198 +214 @@
     my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
 
+    # debugging: print out all the env vars, when import's verbosity is high
+    #foreach my $key (sort(keys %ENV)) {
+    #   print $outhandle "$key = $ENV{$key}\n";
+    #}
+
+#    *If* SOFFICE_HOME\program was not added to the PATH, *another* way is to insert: 
+#    -Doffice.home=C:\\PROGRA~1\\OPENOF~1.ORG
+#    into the command to launch jodconverter so that, when using the remote GS server
+#    on Windows, jodconverter can find the openoffice installation: 
+#    my $office_short_path = Win32::GetShortPathName($ENV{'SOFFICE_HOME'});
+#    my $convert_cmd = "java -Doffice.home=\"".$office_short_path."\" -jar \"$jodjar\""; 
+
     my $convert_cmd = "java -jar \"$jodjar\"";
     $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";