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

Timestamp:

2011-02-23T19:21:25+13:00 (13 years ago)

Author:

ak19

Message:

Second (final) part of allowing user to set which port Jodconverter uses to communicate with soffice. By default this is set to 2002 internal to jodconverter, but it conflicts with programs (like logmein) which use this port, so that jodconverter can fail unless the user is given the ability to change the port it uses.

File:

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

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

@@ -71 +71 @@
         if(!defined $ENV{'SOFFICE_PORT'}) {
             $ENV{'SOFFICE_PORT'} = "8200";
+        }
+        if(!defined $ENV{'JODCONVERTER_PORT'}) {
+            $ENV{'JODCONVERTER_PORT'} = "8100";
         }
         # important to have this set when the Greenstone server 
@@ -226 +229 @@
 #    my $convert_cmd = "java -Doffice.home=\"".$office_short_path."\" -jar \"$jodjar\""; 
 
-    my $convert_cmd = "java -jar \"$jodjar\"";
+    my $convert_cmd = "java -jar \"$jodjar\" --port $ENV{'JODCONVERTER_PORT'}";
     $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";