Changeset 28782

Timestamp:

2014-01-15T14:11:21+13:00 (9 years ago)

Author:

ak19

Message:

Routine for reading in text files failed to 'decode' from UTF-8 to trigger Unicode aware strings. Methods changed to user Superclass to ensure this is now done consitently

Location:

main/trunk/greenstone2/perllib/plugins

Files:

• CSVPlugin.pm (modified) (1 diff)
• TabSeparatedPlugin.pm (modified) (1 diff)

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

@@ -94 +94 @@
     my $self = shift (@_);
     my ($filename, $encoding, $language, $textref) = @_;
-    my $outhandle = $self->{'outhandle'};
 
-    # Read the CSV file content
-    open(FILE, $filename);
-    my $reader = new multiread();
-    $reader->set_handle('CSVPlugin::FILE');
-    $reader->set_encoding($encoding);
-    $reader->read_file($textref);
-    close(FILE);
+    # Read in file the usual ReadTextFile way
+    # This ensure that $textref is a unicode aware string
+    $self->SUPER::read_file(@_);
+
+    #
+    # Now top-up the processing of the text with what this plugin
+    # needs
+    #
 
     # Remove any blank lines so the data is split and processed properly

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

@@ -96 +96 @@
     my $self = shift (@_);
     my ($filename, $encoding, $language, $textref) = @_;
-    my $outhandle = $self->{'outhandle'};
 
-    # Read the Tab-separated file content
-    open(FILE, $filename);
-    my $reader = new multiread();
-    $reader->set_handle('TabSeparatedPlugin::FILE');
-    $reader->set_encoding($encoding);
-    $reader->read_file($textref);
-    close(FILE);
+    # Read in file the usual ReadTextFile way
+    # This ensure that $textref is a unicode aware string
+    $self->SUPER::read_file(@_);
+
+    #
+    # Now top-up the processing of the text with what this plugin
+    # needs
+    #
 
     # Remove any blank lines so the data is split and processed properly