- Timestamp:
- 2012-03-12T21:01:13+13:00 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm
r24687 r25209 54 54 else { 55 55 my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 56 my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 56 #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 57 my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 57 58 58 59 if (!-e $jodjar) { … … 72 73 # the environment variable in setup.bat or <ext>-setup.pl. 73 74 if(!defined $ENV{'JODCONVERTER_PORT'}) { 74 $ENV{'JODCONVERTER_PORT'} = "8100"; 75 $ENV{'JODCONVERTER_PORT'} = "8100"; # make this the same as the soffice_port, by default jodconverter would try 8100 75 76 } 76 77 … … 80 81 } 81 82 if(!defined $ENV{'SOFFICE_PORT'}) { 82 $ENV{'SOFFICE_PORT'} = "8 200";83 $ENV{'SOFFICE_PORT'} = "8100"; # Default that jodconverter is 8100, and since this has to be the same, this best be 8100 83 84 } 84 85 # important to have this set when the Greenstone server … … 228 229 229 230 my $gextoo_home = $ENV{'GEXT_OPENOFFICE'}; 230 my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 231 #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar"); 232 my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar"); 231 233 232 234 # debugging: print out all the env vars, when import's verbosity is high
Note:
See TracChangeset
for help on using the changeset viewer.