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

Timestamp:

2011-09-07T18:52:02+12:00 (13 years ago)

Author:

ak19

Message:

1. Thanks to Diego, a bug was identified which prevented the openoffice extension from working on Ubuntu: there was reference to the Win32 package even when we're not on Windows. 2. The code now does a better job of working out the default location for SOFFICE_HOME if this is not set. 3. The code changes allow the extension to work successfully with LibreOffice, since that is also launched with soffice and because jodjar is able to work with it in the same way as it works with openoffice.

File:

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

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

@@ -232 +232 @@
 #    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\" --port $ENV{'JODCONVERTER_PORT'}"; 
-
-    # commented out the following line since jodjar always assumes that soffice 
-    # is in C:\Prog Files\OpenOffice org 3 rather than checking for any SOFFICE var
-    # the user may have set. So need to run with the -Doffice.home flag that's set above
-    # rather than run without it as was being done below.
-#    my $convert_cmd = "java -jar \"$jodjar\" --port $ENV{'JODCONVERTER_PORT'}";
+
+    my $office_short_path;
+    if(defined $ENV{'SOFFICE_HOME'}) { # points to libreoffice or openoffice, since soffice launches both
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        $office_short_path = Win32::GetShortPathName($ENV{'SOFFICE_HOME'});
+    } else {
+        $office_short_path = $ENV{'SOFFICE_HOME'};
+    }
+    } 
+    else { # SOFFICE_HOME not user-defined, try defaults
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        $office_short_path = "C:\\PROGRA~1\\OPENOF~1.ORG";
+    } else {
+        if (-d "/usr/lib/libreoffice") { # try libreoffice first
+        $office_short_path = "/usr/lib/libreoffice";
+        } elsif (-d "/usr/lib/openoffice") { # perhaps it's more likely that openoffice exists (fallback)
+        $office_short_path = "/usr/lib/openoffice";
+        } else { # set to default linux officeHome which jodconverter tries for
+        $office_short_path = "/opt/openoffice.org3";
+        }
+    }
+    }
+
+    # jodjar always assumes that soffice (officeHome) is in "C:\Prog Files\OpenOffice org 3"
+    # or "/opt/openoffice.org3" rather than checking for any user-defined SOFFICE_HOME var. 
+    # Therefore, we run jodjar with the -Doffice.home flag explicitly set, instead of without.
+    # my $convert_cmd = "java -jar \"$jodjar\" --port $ENV{'JODCONVERTER_PORT'}";
+    my $convert_cmd = "java -Doffice.home=\"".$office_short_path."\" -jar \"$jodjar\" --port $ENV{'JODCONVERTER_PORT'}";
     $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";