Changeset 22953 for main/trunk/greenstone2/perllib

Timestamp:

2010-09-23T17:23:28+12:00 (14 years ago)

Author:

davidb

Message:

Further code tweaks to correctly support Unicode aware strings in our plugin code

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• BasePlugin.pm (modified) (1 diff)
• PDFPlugin.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/BasePlugin.pm

@@ -1015 +1015 @@
     my ($textref, $filename) = @_;
     
-    if (!open (FILE, ">$filename")) {
+    if (!open (FILE, ">:utf8", $filename)) {
     gsprintf(STDERR, "ConvertToPlug::write_file {ConvertToPlug.could_not_open_for_writing} ($!)\n", $filename);
      die "\n";

main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

@@ -332 +332 @@
     }
 
+
+    # The following should no longer be needed, now that strings
+    # read in are Unicode aware (in the Perl sense) rather than
+    # raw binary strings that just happen to be UTF-8 compliant
+
     # turn any high bytes that aren't valid utf-8 into utf-8.
-    unicode::ensure_utf8(\$text);
+##    unicode::ensure_utf8(\$text);
 
     # Write it out again!