Changeset 24475 for main

Timestamp:

2011-08-25T19:03:02+12:00 (13 years ago)

Author:

ak19

Message:

John Thompson's fix for efficient file-reading is useful here too, as he suggested. Tested replace_src_doc_with_html with ASCII and non-ASCII content in input (txt) file.

File:

• main/trunk/greenstone2/bin/script/replace_srcdoc_with_html.pl (modified) (1 diff)

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

@@ -192 +192 @@
     open(FIN,"<$output_filename") or die "replace_srcdoc_with_html.pl: Unable to open $output_filename to ensure utf8...ERROR: $!\n";
     my $html_contents;
-    {
-    local $/ = undef;        # Read entire file at once
-    $html_contents = <FIN>;  # Now file is read in as one single 'line'
-    &unicode::ensure_utf8(\$html_contents); # turn any high bytes that aren't valid utf-8 into utf-8.
-    }
+    # Read in the entire contents of the file in one hit
+    sysread(FIN, $html_contents, -s FIN);
+    &unicode::ensure_utf8(\$html_contents); # turn any high bytes that aren't valid utf-8 into utf-8.
     close(FIN);