Changeset 23734
- Timestamp:
- 2011-02-23T19:11:38+13:00 (13 years ago)
- Location:
- main/trunk/greenstone2/cgi-bin
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/cgi-bin/gsdlCGI.pm
r23732 r23734 454 454 if (!defined $self->{'soffice_home'}) # Don't need to go through it all again if we'd already done this before 455 455 { 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 } 471 476 } 472 477 -
main/trunk/greenstone2/cgi-bin/gsdlsite.cfg.in
r23732 r23734 67 67 #soffice_host 127.0.0.1 68 68 #soffice_port 8200 69 #jodconverter_port 8100 69 70 70 71 # Leave an empty line at the end
Note:
See TracChangeset
for help on using the changeset viewer.