Changeset 25209

Show
Ignore:
Timestamp:
12.03.2012 21:01:13 (8 years ago)
Author:
ak19
Message:

Using the latest version of jodconverter, jodconvertger-2.2.2, since there were conversion issues (like converting Diego's pptx file to html) when tested on the 32bit Win 7 machine.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

    r24687 r25209  
    5454    else { 
    5555    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"); 
    5758 
    5859    if (!-e $jodjar) { 
     
    7273        # the environment variable in setup.bat or <ext>-setup.pl. 
    7374        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 
    7576        } 
    7677 
     
    8081        } 
    8182        if(!defined $ENV{'SOFFICE_PORT'}) { 
    82             $ENV{'SOFFICE_PORT'} = "8200"; 
     83            $ENV{'SOFFICE_PORT'} = "8100"; # Default that jodconverter is 8100, and since this has to be the same, this best be 8100 
    8384        } 
    8485        # important to have this set when the Greenstone server  
     
    228229 
    229230    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"); 
    231233 
    232234    # debugging: print out all the env vars, when import's verbosity is high