Changeset 23349 for main/trunk/greenstone2/perllib/plugins/MARCXMLPlugin.pm

Timestamp:

2010-11-26T12:09:53+13:00 (13 years ago)

Author:

davidb

Message:

More careful use of encoding parameter to $self->set_Source_metadata so it reflects the *filename* encoding that Greenstone has worked out, not the encoding for the *content* of the file, which of course could be completely different!

File:

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

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

@@ -212 +212 @@
 
     my $processor = $self->{'processor'};
-  
+    my $metadata  = $self->{'metadata'};
+
     ##create a new document for each record 
     if ($element eq "record") {
@@ -222 +223 @@
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Language", $language);
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Encoding", $encoding);
+
     my ($filemeta) = $file =~ /([^\\\/]+)$/;
-    $self->set_Source_metadata($doc_obj, $filemeta, $encoding);
+    my $plugin_filename_encoding = $self->{'filename_encoding'};
+    my $filename_encoding = $self->deduce_filename_encoding($file,$metadata,$plugin_filename_encoding);
+    $self->set_Source_metadata($doc_obj, $filemeta, $filename_encoding);
+
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "SourceSegment", "$self->{'record_count'}");
         if ($self->{'cover_image'}) {