Changeset 24736 for main/trunk

Timestamp:

2011-10-07T17:25:23+13:00 (13 years ago)

Author:

ak19

Message:

Perl strings that result from reading in data from text files need to be Unicode aware strings.

File:

• main/trunk/greenstone2/perllib/plugins/MetadataCSVPlugin.pm (modified) (2 diffs)

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

@@ -118 +118 @@
     &util::block_filename($block_hash,$filename);
 
+
     # Read the CSV file to get the metadata
     my $csv_file_content;
@@ -124 +125 @@
     $csv_file_reader->set_handle('MetadataCSVPlugin::CSV_FILE');
     $csv_file_reader->read_file(\$csv_file_content);
+
+    # Would be nice if MetadataCSVPlugin was extended to support a minus
+    # option to choose the character encoding the CSV file is in 
+    # For now we will assume it is always in UTF8
+    $csv_file_content = decode("utf8",$csv_file_content);
+
     close(CSV_FILE);