Changeset 25334 for gs2-extensions/open-office/trunk

Timestamp:

2012-04-03T15:33:33+12:00 (12 years ago)

Author:

ak19

Message:

Katherine discovered a bug when using the openoffice extension on CentOS. We discovered there were 2 fixes required to the perl code: SOFFICE_HOME has a new possible path (usr/lib64) and in Linux we were not starting up soffice with the correct accept string for recent updates (which were only made for windows).

File:

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

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

@@ -64 +64 @@
     else {
         # test to see if soffice is in path     
-        my $cmd = "soffice -headless 2>&1"; # for linux and mac
+
+        if(!defined $ENV{'SOFFICE_HOST'}) {
+        $ENV{'SOFFICE_HOST'} = "localhost";
+        }
+        if(!defined $ENV{'SOFFICE_PORT'}) {
+        $ENV{'SOFFICE_PORT'} = "8100"; 
+        }
+        
+        #my $cmd = "soffice -headless 2>&1"; # for linux and mac
+        my $cmd = "soffice \"-accept=socket,host=$ENV{'SOFFICE_HOST'},port=$ENV{'SOFFICE_PORT'};urp;StarOffice.ServiceManager\" -headless 2>&1"; # for linux and mac
         my $status = 0;
 
@@ -71 +80 @@
         # The default port that jodconverter expects OO to listen on is 8100, so we try that.
         if ($ENV{'GSDLOS'} =~ m/^windows$/) {       
-        if(!defined $ENV{'SOFFICE_HOST'}) {
-            $ENV{'SOFFICE_HOST'} = "localhost";
-        }
-        if(!defined $ENV{'SOFFICE_PORT'}) {
-            $ENV{'SOFFICE_PORT'} = "8100"; 
-        }
+        
         # important to have this set when the Greenstone server 
         # and open office is on a remote windows machine
@@ -166 +170 @@
 }
 
+# launch_cmd variable seems to be entirely unused
 sub init {
     my $self = shift(@_);
@@ -252 +257 @@
         } elsif (-d "/usr/lib/openoffice") { # perhaps it's more likely that openoffice exists (fallback)
         $office_short_path = "/usr/lib/openoffice";
+        } elsif (-d "/usr/lib64/openoffice.org3") { # on 64 bit linux such as kjdon's CentOS
+        $office_short_path = "/usr/lib64/openoffice.org3";
         } else { # set to default linux officeHome which jodconverter tries for
         $office_short_path = "/opt/openoffice.org3";