Changeset 23461 for main

Timestamp:

2010-12-13T14:48:20+13:00 (13 years ago)

Author:

kjdon

Message:

set_Source_metadata now takes an optional section argument so that we can assign Source and SourceFile to sections not just top level. Needed for pagedimageplugin.

File:

• main/trunk/greenstone2/perllib/plugins/BasePlugin.pm (modified) (4 diffs)

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

@@ -934 +934 @@
 sub set_Source_metadata {
     my $self = shift (@_);  
-    my ($doc_obj, $raw_filename, $filename_encoding) = @_;
-
+    my ($doc_obj, $raw_filename, $filename_encoding, $section) = @_;
+    
     # 1. Sets the filename (Source) for display encoded as Unicode if possible,
     #    and (as a fallback) using %xx if not for non-ascii chars
@@ -943 +943 @@
     my ($unused_full_rf, $raw_file) = &util::get_full_filenames("", $raw_filename);
 
-    my $top_section = $doc_obj->get_top_section();
+    my $this_section = (defined $section)? $section : $doc_obj->get_top_section();
 
     my $octet_file = $raw_file;
@@ -984 +984 @@
     
     # Source is the UTF8 display name - not necessarily the name of the file on the system
-    $doc_obj->set_utf8_metadata_element($top_section, "Source", $url_encoded_filename); 
+    $doc_obj->set_utf8_metadata_element($this_section, "Source", $url_encoded_filename); 
     
     my $renamed_raw_file = &util::rename_file($raw_file, $self->{'file_rename_method'});
@@ -991 +991 @@
     my $renamed_raw_url = &unicode::filename_to_url($renamed_raw_file);
 
-    $doc_obj->set_utf8_metadata_element($top_section, "SourceFile",
+    $doc_obj->set_utf8_metadata_element($this_section, "SourceFile",
                     $renamed_raw_url);