Changeset 23734

Show
Ignore:
Timestamp:
23.02.2011 19:11:38 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/cgi-bin/gsdlCGI.pm

    r23732 r23734  
    454454    if (!defined $self->{'soffice_home'}) # Don't need to go through it all again if we'd already done this before 
    455455    { 
    456     # First look in the gsdlsite.cfg file for the openoffice properties to be defined 
    457     $self->{'soffice_home'} = $self->get_config_info("soffice_home", $optional); 
    458     $self->{'soffice_host'} = $self->get_config_info("soffice_host", $optional); 
    459     $self->{'soffice_port'} = $self->get_config_info("soffice_port", $optional); 
    460      
    461     if (defined $self->{'soffice_home'}) { 
    462         $ENV{'SOFFICE_HOME'} = $self->{'soffice_home'};  
    463     }    
    464     if (defined $self->{'soffice_host'}) { 
    465         $ENV{'SOFFICE_HOST'} = $self->{'soffice_host'};  
    466     } 
    467     if (defined $self->{'soffice_port'}) { 
    468         $ENV{'SOFFICE_PORT'} = $self->{'soffice_port'};  
    469     } 
    470     } 
     456        # Look in gsdlsite.cfg for whether the openoffice  
     457        # and jodconverter properties have been defined 
     458        $self->{'soffice_home'} = $self->get_config_info("soffice_home", $optional); 
     459        $self->{'soffice_host'} = $self->get_config_info("soffice_host", $optional); 
     460        $self->{'soffice_port'} = $self->get_config_info("soffice_port", $optional); 
     461        $self->{'jodconverter_port'} = $self->get_config_info("jodconverter_port", $optional); 
     462         
     463        if (defined $self->{'soffice_home'}) { 
     464            $ENV{'SOFFICE_HOME'} = $self->{'soffice_home'};  
     465        }    
     466        if (defined $self->{'soffice_host'}) { 
     467            $ENV{'SOFFICE_HOST'} = $self->{'soffice_host'};  
     468        } 
     469        if (defined $self->{'soffice_port'}) { 
     470            $ENV{'SOFFICE_PORT'} = $self->{'soffice_port'};  
     471        } 
     472        if (defined $self->{'jodconverter_port'}) { 
     473            $ENV{'JODCONVERTER_PORT'} = $self->{'jodconverter_port'}; 
     474        } 
     475    } 
    471476} 
    472477 
  • main/trunk/greenstone2/cgi-bin/gsdlsite.cfg.in

    r23732 r23734  
    6767#soffice_host 127.0.0.1 
    6868#soffice_port 8200 
     69#jodconverter_port 8100 
    6970 
    7071# Leave an empty line at the end