Changeset 25218 for gs2-extensions/open-office

Timestamp:

2012-03-14T15:46:42+13:00 (12 years ago)

Author:

ak19

Message:

1. Cleaning up refs to the JODCONVERTER_PORT env var which has been phased out since it ought to be the same as SOFFICE_PORT to which it should connect. 2. The GLI OpenOffice extension plugin provides the option of changing the listening port. If changed, this change was previously not being transmitted to the actual command being run. This should now be the case, still requires testing.

Location:

gs2-extensions/open-office/trunk/src

Files:

• perllib/plugins/OpenOfficeConverter.pm (modified) (3 diffs)
• setup.bat (modified) (1 diff)

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

@@ -67 +67 @@
         my $status = 0;
 
-        # The port that jodconverter uses to connect to soffice.
-        # We set this to 8100 (else jodconverter would have used 
-        # 2002 as the port number, which can clash with some programs
-        # such as LogMeIn. Users can specify another port by setting
-        # the environment variable in setup.bat or <ext>-setup.pl.
-        if(!defined $ENV{'JODCONVERTER_PORT'}) {
-        $ENV{'JODCONVERTER_PORT'} = "8100"; # make this the same as the soffice_port, by default jodconverter would try 8100
-        }
-
+        # No more JODCONVERTER_PORT env var: the port that jodconverter uses is now the
+        # same as SOFFICE_PORT, because the 2 are meant to communicate on the same port.
+        # 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'}) {
@@ -81 +75 @@
         }
         if(!defined $ENV{'SOFFICE_PORT'}) {
-            $ENV{'SOFFICE_PORT'} = "8100"; # Default that jodconverter is 8100, and since this has to be the same, this best be 8100
+            $ENV{'SOFFICE_PORT'} = "8100"; 
         }
         # important to have this set when the Greenstone server 
@@ -264 +258 @@
     }
 
+    #if($self->{'openoffice_port'} != $ENV{'SOFFICE_PORT'}) { # if the user changed it
+    #$ENV{'SOFFICE_PORT'} = $self->{'openoffice_port'};
+    #}
+
     # 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'}";
+    # my $convert_cmd = "java -jar \"$jodjar\" --port $ENV{'SOFFICE_PORT'}";   
+    my $convert_cmd = "java -Doffice.home=\"".$office_short_path."\" -jar \"$jodjar\" --port $self->{'openoffice_port'}"; # --port $ENV{'SOFFICE_PORT'}
     $convert_cmd .= " \"$source_file_full_path\" \"$target_file_path\"";
 

gs2-extensions/open-office/trunk/src/setup.bat

@@ -11 +11 @@
 :: set SOFFICE_HOME=C:\Program Files\OpenOffice.org 3\program
 :: set SOFFICE_HOST=localhost
-:: set SOFFICE_PORT=8200
-:: set JODCONVERTER_PORT=8100
+:: set SOFFICE_PORT=8100