Changeset 23734

Timestamp:

2011-02-23T19:11:38+13:00 (13 years ago)

Author:

ak19

Message:

First 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.

Location:

main/trunk/greenstone2/cgi-bin

Files:

• gsdlCGI.pm (modified) (1 diff)
• gsdlsite.cfg.in (modified) (1 diff)

main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

@@ -454 +454 @@
     if (!defined $self->{'soffice_home'}) # Don't need to go through it all again if we'd already done this before
     {
-    # First look in the gsdlsite.cfg file for the openoffice properties to be defined
-    $self->{'soffice_home'} = $self->get_config_info("soffice_home", $optional);
-    $self->{'soffice_host'} = $self->get_config_info("soffice_host", $optional);
-    $self->{'soffice_port'} = $self->get_config_info("soffice_port", $optional);
-    
-    if (defined $self->{'soffice_home'}) {
-        $ENV{'SOFFICE_HOME'} = $self->{'soffice_home'}; 
-    }   
-    if (defined $self->{'soffice_host'}) {
-        $ENV{'SOFFICE_HOST'} = $self->{'soffice_host'}; 
-    }
-    if (defined $self->{'soffice_port'}) {
-        $ENV{'SOFFICE_PORT'} = $self->{'soffice_port'}; 
-    }
-    }
+        # Look in gsdlsite.cfg for whether the openoffice 
+        # and jodconverter properties have been defined
+        $self->{'soffice_home'} = $self->get_config_info("soffice_home", $optional);
+        $self->{'soffice_host'} = $self->get_config_info("soffice_host", $optional);
+        $self->{'soffice_port'} = $self->get_config_info("soffice_port", $optional);
+        $self->{'jodconverter_port'} = $self->get_config_info("jodconverter_port", $optional);
+        
+        if (defined $self->{'soffice_home'}) {
+            $ENV{'SOFFICE_HOME'} = $self->{'soffice_home'}; 
+        }   
+        if (defined $self->{'soffice_host'}) {
+            $ENV{'SOFFICE_HOST'} = $self->{'soffice_host'}; 
+        }
+        if (defined $self->{'soffice_port'}) {
+            $ENV{'SOFFICE_PORT'} = $self->{'soffice_port'}; 
+        }
+        if (defined $self->{'jodconverter_port'}) {
+            $ENV{'JODCONVERTER_PORT'} = $self->{'jodconverter_port'};
+        }
+    }
 }
 

main/trunk/greenstone2/cgi-bin/gsdlsite.cfg.in

@@ -67 +67 @@
 #soffice_host 127.0.0.1
 #soffice_port 8200
+#jodconverter_port 8100
 
 # Leave an empty line at the end