Changeset 28355 for main/trunk/greenstone2/bin/script

Timestamp:

2013-10-04T19:52:18+13:00 (11 years ago)

Author:

ak19

Message:

1. Now gsConvert.pl calls the new pptextract.vbs VBScript (which creates .item files and ppt slide.txt files in utf-8) instead of the older VB pptextract.exe executable which created .item and slide.txt files in windows default utf-16 LE. 2. PagedImagePlugin.pm::tidy_item_file now reads in the .item files in utf-8 mode, so that its strings are unicode aware. Substitutions are of unicode code points instead of byte sequences, since the strings in the file are now unicode aware.

File:

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

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

@@ -386 +386 @@
     my $vbScript = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin",
                        $ENV{'GSDLOS'}, "pptextract");
-    $vbScript = "pptextract" if ($ENV{'GSDLOS'} =~ m/^windows$/i);
+    $vbScript = "CScript //Nologo \"".$vbScript.".vbs\"" if ($ENV{'GSDLOS'} =~ m/^windows$/i); # now we use the .vbs VBScript
+    # $vbScript = "pptextract" if ($ENV{'GSDLOS'} =~ m/^windows$/i); # back when the pptextract.exe VB executable was used
             
     my $cmd = "";
@@ -398 +399 @@
         $cmd .= " 2>\"$output_filestem.err\""
         if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
+
         if (system($cmd) !=0) {
         print STDERR "Powerpoint VB Scripting convert failed\n";
@@ -549 +551 @@
                                             # else script launch fails when there are error msgs
             $vbScript = &FileUtils::filenameConcatenate($vbScript, "docx2html.vbs"); 
-            $vbScript = "CScript //Nologo \"$vbScript\"";   # launche with CScript for error output in STDERR
+            $vbScript = "CScript //Nologo \"$vbScript\"";   # launch with CScript for error output in STDERR
                                     # //Nologo flag avoids Microsoft's opening/logo msgs
             print STDERR "About to use windows scripting to process docx file $input_filename.\n";