Changeset 25209 for gs2-extensions/open-office

Timestamp:

2012-03-12T21:01:13+13:00 (12 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.

File:

• gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm (modified) (4 diffs)

gs2-extensions/open-office/trunk/src/perllib/plugins/OpenOfficeConverter.pm

@@ -54 +54 @@
     else {
     my $gextoo_home = $ENV{'GEXT_OPENOFFICE'};
-    my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
+    #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
+    my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
 
     if (!-e $jodjar) {
@@ -72 +73 @@
         # the environment variable in setup.bat or <ext>-setup.pl.
         if(!defined $ENV{'JODCONVERTER_PORT'}) {
-        $ENV{'JODCONVERTER_PORT'} = "8100";
+        $ENV{'JODCONVERTER_PORT'} = "8100"; # make this the same as the soffice_port, by default jodconverter would try 8100
         }
 
@@ -80 +81 @@
         }
         if(!defined $ENV{'SOFFICE_PORT'}) {
-            $ENV{'SOFFICE_PORT'} = "8200";
+            $ENV{'SOFFICE_PORT'} = "8100"; # Default that jodconverter is 8100, and since this has to be the same, this best be 8100
         }
         # important to have this set when the Greenstone server 
@@ -228 +229 @@
 
     my $gextoo_home = $ENV{'GEXT_OPENOFFICE'};
-    my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
+    #my $jodjar = &util::filename_cat($gextoo_home,"lib","java","jodconverter.jar");
+    my $jodjar = &util::filename_cat($gextoo_home,"jodconverter-2.2.2","lib","jodconverter-cli-2.2.2.jar");
 
     # debugging: print out all the env vars, when import's verbosity is high