Changeset 23473

Timestamp:

2010-12-14T11:35:25+13:00 (13 years ago)

Author:

ak19

Message:

Provision for supporting .docx and .pptx files when Windows scripting is on.

File:

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

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

@@ -98 +98 @@
     my ($input_type,$output_type,$verbose);
 
-    
+    # Dynamically figure out what the --type option can support, based on whether -windows_scripting 
+    # is in use or not
+    my $default_type_re = "(doc|dot|pdf|ps|ppt|rtf|xls)";
+    #my $enhanced_type_re = "(docx?|dot|pdf|ps|pptx?|rtf|xlsx?)";
+    #my $enhanced_type_re = "(docx?|dot|pdf|ps|pptx?|rtf|xlsx?)";
+    # Currently only have VBA for Word and PPT(but no XLS)
+    my $enhanced_type_re = "(docx?|dot|pdf|ps|pptx?|rtf|xls)";
+
+    my $type_re = $default_type_re;
+    
+    foreach my $a (@ARGV) {
+        if ($a =~ m/^windows_scripting$/i) {
+            $type_re = $enhanced_type_re;
+        }
+    }
+    
     # read command-line arguments
     if (!parsargv::parse(\@ARGV,
-             'type/(doc|dot|pdf|ps|ppt|rtf|xls)/', \$input_type,
+             "type/$type_re/", \$input_type,
              '/errlog/.*/', \$faillogfile,
              'output/(auto|html|text|pagedimg).*/', \$output_type,
@@ -148 +163 @@
     exit(1);
     } 
-    elsif ($input_type eq "doc" || $input_type eq "dot") {
+    elsif ($input_type =~ m/^docx?$/ || $input_type eq "dot") {
     print &convertDOC($input_filename, $output_filestem, $output_type);
     print "\n";
@@ -164 +179 @@
     print "\n";
     } 
-    elsif ($input_type eq "ppt") {
+    elsif ($input_type =~ m/pptx?$/) {
     print &convertPPT($input_filename, $output_filestem, $output_type);
     print "\n";
     } 
-    elsif ($input_type eq "xls") {
+    elsif ($input_type =~ m/xlsx?$/) {
     print &convertXLS($input_filename, $output_filestem, $output_type);
     print "\n";
@@ -203 +218 @@
     my $realtype = &find_docfile_type($input_filename);
 
-    if ($realtype eq "word6" || $realtype eq "word7" || $realtype eq "word8") {
+    if ($realtype eq "word6" || $realtype eq "word7" 
+        || $realtype eq "word8" || $realtype eq "docx") {
     return &convertWord678($input_filename, $output_filestem, $output_type);
     } elsif ($realtype eq "rtf") {
@@ -455 +471 @@
 sub find_docfile_type {
     my ($input_filename) = @_;
-    
+    
+    if (($windows_scripting) && ($input_filename =~ m/\.docx$/)) {
+        return "docx";
+    }
+    
     open(CHK, "<$input_filename");
     binmode(CHK);
@@ -477 +497 @@
     if ($line =~ m/Word\.Document\.([678])/) {
         close(CHK);
+
         return "word$1";
     }