Ignore:
Timestamp:
2013-10-04T19:52:18+13:00 (8 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:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/gsConvert.pl

    r28166 r28355  
    386386    my $vbScript = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin",
    387387                       $ENV{'GSDLOS'}, "pptextract");
    388     $vbScript = "pptextract" if ($ENV{'GSDLOS'} =~ m/^windows$/i);
     388    $vbScript = "CScript //Nologo \"".$vbScript.".vbs\"" if ($ENV{'GSDLOS'} =~ m/^windows$/i); # now we use the .vbs VBScript
     389    # $vbScript = "pptextract" if ($ENV{'GSDLOS'} =~ m/^windows$/i); # back when the pptextract.exe VB executable was used
    389390           
    390391    my $cmd = "";
     
    398399        $cmd .= " 2>\"$output_filestem.err\""
    399400        if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000);
     401
    400402        if (system($cmd) !=0) {
    401403        print STDERR "Powerpoint VB Scripting convert failed\n";
     
    549551                                            # else script launch fails when there are error msgs
    550552            $vbScript = &FileUtils::filenameConcatenate($vbScript, "docx2html.vbs");
    551             $vbScript = "CScript //Nologo \"$vbScript\"";   # launche with CScript for error output in STDERR
     553            $vbScript = "CScript //Nologo \"$vbScript\"";   # launch with CScript for error output in STDERR
    552554                                    # //Nologo flag avoids Microsoft's opening/logo msgs
    553555            print STDERR "About to use windows scripting to process docx file $input_filename.\n";
Note: See TracChangeset for help on using the changeset viewer.