Changeset 23352 for main/trunk/greenstone2/perllib/plugins/ReadXMLFile.pm

Timestamp:

2010-11-28T23:24:22+13:00 (13 years ago)

Author:

davidb

Message:

Modifications to code to support filename encoding issues when tested under Windows

File:

• main/trunk/greenstone2/perllib/plugins/ReadXMLFile.pm (modified) (1 diff)

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

@@ -369 +369 @@
     my $self = shift(@_);
 
-    my $metadata = $self->{'metadata'};
+    my $metadata = $self->{'metadata'};
+    my $filename_full_path = $self->{'filename'};
 
     # create a new document
-    my $doc_obj = $self->{'doc_obj'} = new doc ($self->{'filename'}, "indexed_doc", $self->{'file_rename_method'});
+    my $doc_obj = $self->{'doc_obj'} = new doc ($filename_full_path, "indexed_doc", $self->{'file_rename_method'});
 
     $doc_obj->add_utf8_metadata($doc_obj->get_top_section(), "Plugin", "$self->{'plugin_type'}");
 
-    my $filename_no_path = $self->{'filename_no_path'};
-    my $plugin_filename_encoding = $self->{'filename_encoding'};
+    my $filename_no_path = $self->{'filename_no_path'};
+    my $plugin_filename_encoding = $self->{'filename_encoding'};
     my $filename_encoding = $self->deduce_filename_encoding($filename_no_path,$metadata,$plugin_filename_encoding);
 
-    $self->set_Source_metadata($doc_obj, $filename_no_path, $filename_encoding);
+    $self->set_Source_metadata($doc_obj, $filename_full_path, $filename_encoding);
     
     # do we want other auto metadata here (see BasePlugin.read_into_doc_obj)