Changeset 23738 for gs2-extensions/open-office/trunk/src

Timestamp:

2011-02-24T15:48:00+13:00 (13 years ago)

Author:

ak19

Message:

Fixing yesterday's addition of the JODCONVERTER_PORT env var to work on Linux

File:

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

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

@@ -65 +65 @@
         my $cmd = "soffice -headless 2>&1"; # for linux and mac
 
+        # 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";
+        }
+
         if ($ENV{'GSDLOS'} =~ m/^windows$/) {       
         if(!defined $ENV{'SOFFICE_HOST'}) {
@@ -71 +80 @@
         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