Changeset 23349 for main/trunk/greenstone2/perllib/plugins/PagedImagePlugin.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/PagedImagePlugin.pm (modified) (5 diffs)

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

@@ -316 +316 @@
 
     #process the .item file
-    $doc_obj = $self->process_item($filename_full_path, $dir, $file, $processor);
+    $doc_obj = $self->process_item($filename_full_path, $dir, $file, $processor, $metadata);
     
     }
@@ -513 +513 @@
     $self->{'doc_obj'} = new doc ($self->{'filename'}, "indexed_doc", $self->{'file_rename_method'});
     # TODO is file filenmae_no_path??
-    $self->set_initial_doc_fields($self->{'doc_obj'}, $self->{'file'}, $self->{'processor'});
+    $self->set_initial_doc_fields($self->{'doc_obj'}, $self->{'file'}, $self->{'processor'}, $self->{'metadata'});
 
     my ($dir, $file) = $self->{'filename'} =~ /^(.*?)([^\/\\]*)$/;
@@ -540 +540 @@
 sub set_initial_doc_fields {
     my $self = shift(@_);
-    my ($doc_obj, $filename_no_path, $processor) = @_;
+    my ($doc_obj, $filename_no_path, $processor, $metadata) = @_;
 
     my $topsection = $doc_obj->get_top_section();
@@ -552 +552 @@
     }
 
-    $self->set_Source_metadata($doc_obj, $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);
    
     # if we want a header page, we need to add some text into the top section, otherwise this section will become invisible
@@ -615 +617 @@
 sub process_item {
     my $self = shift (@_);
-    my ($filename_full_path, $dir, $filename_no_path, $processor) = @_;
+    my ($filename_full_path, $dir, $filename_no_path, $processor, $metadata) = @_;
 
     my $doc_obj = new doc ($filename_full_path, "indexed_doc", $self->{'file_rename_method'});
-    $self->set_initial_doc_fields($doc_obj, $filename_no_path, $processor);
+    $self->set_initial_doc_fields($doc_obj, $filename_no_path, $processor, $metadata);
     my $topsection = $doc_obj->get_top_section();
     open (ITEMFILE, $filename_full_path) || die "couldn't open $filename_full_path\n";