Changeset 24166 for main/trunk/greenstone2/bin/script/gsConvert.pl

Timestamp:

2011-06-16T19:16:15+12:00 (13 years ago)

Author:

ak19

Message:

2nd and tentatively final set of changes changes to get the new docx2html functionality to work on docx files. The changes have to do with error reporting when Word is not installed/can't be found/can't be instantiated, when the script is launched with the wrong number of args and if the input file does not exist. WordPlugin now has docx as part of the default process_expression (even when OO is not installed).

File:

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

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

@@ -786 +786 @@
     my ($input_filename, $output_filestem) = @_;
 
-    my $vbScript = &util::filename_cat($ENV{'GSDLHOME'}, "bin",
-                       $ENV{'GSDLOS'}, "word2html");
+    # build up the path to the doc-to-html conversion tool we're going to use
+    my $vbScript = &util::filename_cat($ENV{'GSDLHOME'}, "bin", $ENV{'GSDLOS'});
 
     if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
-    # if windows scripting with docx input, use new VBscript
-    if($input_filename =~ m/docx$/i) {
-        $vbScript = "docx2html.vbs"; 
-    } else { # use the usual word2html conversion VB executable
-        $vbScript = "word2html";
-    }
-    }
+        # if windows scripting with docx input, use new VBscript to get the local Word install (if
+        # any) to do the conversion, since docX can't be processed by word2html's windows_scripting
+        
+        if($input_filename =~ m/docx$/i) {  # need to use full path to docx2html script, 
+                                            # else script launch fails when there are error msgs
+            $vbScript = &util::filename_cat($vbScript, "docx2html.vbs"); 
+            $vbScript = "CScript //Nologo \"$vbScript\"";   # launche with CScript for error output in STDERR
+                                                            # //Nologo flag avoids Microsoft's opening/logo msgs
+        } 
+        else {  # old doc versions. use the usual VB executable word2html for the
+                # conversion. Doesn't need full path, since bin\windows is on PATH          
+            $vbScript = "word2html"; #$vbScript = "\"".&util::filename_cat($vbScript, "word2html")."\"";
+        }
+    } 
+    else { # not windows
+        $vbScript = "\"".&util::filename_cat($vbScript, "word2html")."\"";
+    }
 
     if (-e "$output_filestem.html") {
@@ -812 +822 @@
 
     # redirecting STDERR
-    $cmd .= " 2> \"$output_filestem.err\""
-    if ($ENV {'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
-    
+    
+    $cmd .= " 2> \"$output_filestem.err\""
+        if ($ENV {'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);    
+    #print STDERR "@@@@@@@@@ cmd=$cmd\n";
+    
     # execute the command
     $!=0;
@@ -822 +834 @@
     if (-s "$output_filestem.err") {
         open (ERRFILE, "<$output_filestem.err");
-        
+        
         my $write_to_fail_log=0;
         if ($faillogfile ne "" && defined(open(FAILLOG,">>$faillogfile")))