Changeset 28355
- Timestamp:
- 2013-10-04T19:52:18+13:00 (10 years ago)
- Location:
- main/trunk/greenstone2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/bin/script/gsConvert.pl
r28166 r28355 386 386 my $vbScript = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'}, "bin", 387 387 $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 389 390 390 391 my $cmd = ""; … … 398 399 $cmd .= " 2>\"$output_filestem.err\"" 399 400 if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000); 401 400 402 if (system($cmd) !=0) { 401 403 print STDERR "Powerpoint VB Scripting convert failed\n"; … … 549 551 # else script launch fails when there are error msgs 550 552 $vbScript = &FileUtils::filenameConcatenate($vbScript, "docx2html.vbs"); 551 $vbScript = "CScript //Nologo \"$vbScript\""; # launch ewith CScript for error output in STDERR553 $vbScript = "CScript //Nologo \"$vbScript\""; # launch with CScript for error output in STDERR 552 554 # //Nologo flag avoids Microsoft's opening/logo msgs 553 555 print STDERR "About to use windows scripting to process docx file $input_filename.\n"; -
main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.pm
r27509 r28355 407 407 my ($filename) = @_; 408 408 409 open (ITEMFILE, $filename) || die "couldn't open $filename\n";409 open (ITEMFILE, "<:encoding(UTF-8)", $filename) || die "couldn't open $filename\n"; 410 410 my $backup_filename = "backup.item"; 411 411 open (BACKUP,">$backup_filename")|| die "couldn't write to $backup_filename\n"; 412 binmode(BACKUP, ":utf8"); 412 413 my $line = ""; 413 414 $line = <ITEMFILE>; 414 $line =~ s/^\xEF\xBB\xBF//; # strip BOM 415 $line =~ s/\x0B+//ig; 415 #$line =~ s/^\xEF\xBB\xBF//; # strip BOM in text file read in as a sequence of bytes (not unicode aware strings) 416 $line =~ s/^\x{FEFF}//; # strip BOM in file opened *as UTF-8*. Strings in the file just read in are now unicode-aware, 417 # this means the BOM is now a unicode codepoint instead of a byte sequence 418 # See http://en.wikipedia.org/wiki/Byte_order_mark and http://perldoc.perl.org/5.14.0/perlunicode.html 419 $line =~ s/\x{0B}+//ig; # removing \vt-vertical tabs using the unicode codepoint for \vt 416 420 $line =~ s/&/&/g; 417 421 print BACKUP ($line); 418 422 #Tidy up the item file some metadata title contains \vt-vertical tab 419 423 while ($line = <ITEMFILE>) { 420 $line =~ s/\x 0B+//ig;424 $line =~ s/\x{0B}+//ig; # removing \vt-vertical tabs using the unicode codepoint for \vt 421 425 $line =~ s/&/&/g; 422 426 print BACKUP ($line); … … 657 661 my $self = shift (@_); 658 662 my ($filename_full_path, $dir, $block_hash) = @_; 663 659 664 660 665 open (ITEMFILE, $filename_full_path) || die "couldn't open $filename_full_path to work out which files to block\n";
Note:
See TracChangeset
for help on using the changeset viewer.