Changeset 24104 for gs2-extensions

Timestamp:

2011-05-31T16:57:13+12:00 (13 years ago)

Author:

ak19

Message:

OpenOfficeConverter needs to have the -Doffice.home flag set in order to always find the soffice program (else it assumes it's installed in a default locaton that turns out to not be the case on a 64 bit Win 7 machine

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\""; 
-
-    my $convert_cmd = "java -jar \"$jodjar\" --port $ENV{'JODCONVERTER_PORT'}";
+    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'}";
     $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";