Changeset 32089 for main/trunk


Ignore:
Timestamp:
12/08/17 19:16:12 (3 years ago)
Author:
ak19
Message:
  1. Attempted fix by Kathy and me for Diego's problem of PDFBox's handling of a PDF. When it was set to convert_to_html, it built fine, but convert_to_text produced something that was invalid XML in doc.XML and build failed. Diego reasoned correctly that building ought to succeed in both cases if it succeeded in one case. Kathy found the correct fix for escaping the ampersand character (it wasn't & to & that I'd attempted, nor did using HTML::Entities' encode work either). 2. The fix needed to read and write files, so introducing readUTF8File() and writeUTF8File() into FileUtils.pm for reusability. Need to still contact John Thompson to ask him if and how these functions need to be modified to support parallel processing, for which FileUtils was written.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/FileUtils.pm

    r31724 r32089  
    6060# util::soft_link()            => FileUtils::softLink()
    6161
     62# Functions that have been added, but not by John Thompson,
     63# So the implementations don't support parallel processing yet, but they print a warning and the
     64# correct implementation can be put into here. So that if all calls for reading and writing UTF8
     65# file content go through here, then they will do the right thing when the functions are updated.
     66#
     67#  => FileUtils::readUTF8File()
     68#  => FileUtils::writeUTF8File()
     69#
     70
    6271# Other functions in this file (perhaps some of these may have counterparts in util.pm too):
    6372
     
    962971## readDirectory()
    963972
     973## @function readUTF8File()
     974#
     975# read contents from a file containing UTF8.
     976#
     977# Parameter filename, the filepath to read from
     978#
     979sub readUTF8File
     980{
     981    my $filename = shift(@_);
     982
     983    print STDERR "@@@ Warning FileUtils::readFile() not yet implemented for parallel processing. Using regular version...\n";
     984   
     985    open(FIN,"<$filename") or die "FileUtils::readFile: Unable to open $filename for reading...ERROR: $!\n";
     986
     987    # decode the bytes in the file with UTF8 enc,
     988    # to get unicode aware strings that represent utf8 chars
     989    binmode(FIN,":utf8");
     990   
     991    my $contents;
     992    # Read in the entire contents of the file in one hit
     993    sysread(FIN, $contents, -s FIN);
     994    close(FIN);
     995    return $contents;   
     996}
     997## readUTF8File()
     998
     999## @function writeUTF8File()
     1000#
     1001# write UTF8 contents to a file.
     1002#
     1003# Parameter filename, the filepath to write to
     1004# Parameter contentRef, a *reference* to the contents to write out
     1005#
     1006sub writeUTF8File
     1007{
     1008    my ($filename, $contentRef) = @_;
     1009
     1010    print STDERR "@@@ Warning FileUtils::writeFile() not yet implemented for parallel processing. Using regular version...\n";
     1011
     1012    open(FOUT, ">$filename") or die "FileUtils::writeFile: Unable to open $filename for writing out contents...ERROR: $!\n";
     1013    # encode the unicode aware characters in the string as utf8
     1014    # before writing out the resulting bytes
     1015    binmode(FOUT,":utf8");
     1016   
     1017    print FOUT $$contentRef;
     1018    close(FOUT);
     1019}
     1020## writeUTF8File()
     1021
    9641022## @function removeFiles()
    9651023#
Note: See TracChangeset for help on using the changeset viewer.