Changeset 22513 for main/trunk/greenstone2

Timestamp:

2010-07-27T16:06:11+12:00 (14 years ago)

Author:

kjdon

Message:

added open office support for PPT and excel

File:

• main/trunk/greenstone2/bin/script/gsConvert.pl (modified) (3 diffs)

main/trunk/greenstone2/bin/script/gsConvert.pl

@@ -401 +401 @@
 
     my $ppt_convert_type = "";
+
+    if ($openoffice_scripting) {
+    # Jump right in and process with Open Office
+        if (openoffice_doc_to_html($input_filename, $output_filestem)) {
+        return "html";
+    }
+    else {
+        return "fail";
+    }
+    }
+    
     #if (!$output_type || $windows_scripting || ($output_type !~ m/html/i) || ($output_type !~ m/text/i)){
     if ($windows_scripting && ($output_type !~ m/html/i) && ($output_type !~ m/text/i)){
@@ -464 +475 @@
     my $success = 0;
 
+    if ($openoffice_scripting) {
+    # Jump right in and process with Open Office
+        if (openoffice_doc_to_html($input_filename, $output_filestem)) {
+        return "html";
+    }
+    else {
+        return "fail";
+    }
+    }
+    
     # Attempt conversion to HTML
     if (!$output_type || ($output_type =~ m/html/i)) {
@@ -1122 +1143 @@
         close ERRLOG;
     }
+    print STDERR "***********output filestem $output_filestem.html\n";
     &util::rm("$output_filestem.html") if (-e "$output_filestem.html");
     if (-e "$output_filestem.err") {