Changeset 23759

Timestamp:

2011-03-02T16:18:22+13:00 (13 years ago)

Author:

davidb

Message:

Now that generalized exploding is coming on-line, some additional checks are needed. In this case, an exploded document will already have an original metadata field called Source. Detect this and retain its value under the metadata name OrigSource

File:

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

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

@@ -434 +434 @@
     my $coverfile = $filename;
     $coverfile =~ s/\.[^\\\/\.]+$/\.jpg/;
+
     if (!&util::fd_exists($coverfile)) {
         $coverfile =~ s/jpg$/JPG/;
@@ -961 +962 @@
 #   print STDERR "****** saving Source as:             $url_encoded_filename\n";
 #    }
-    
-    
+
+    # In the case of converted files and (generalized) exploded documents, there
+    # will already be a source filename => store as OrigSource before overriding
+    my $orig_source = $doc_obj->get_metadata_element ($this_section, "Source");
+    if ((defined $orig_source) && ($orig_source !~ m/^\s*$/)) {
+    $doc_obj->set_utf8_metadata_element($this_section, "OrigSource", $orig_source); 
+    }
+        
     # Source is the UTF8 display name - not necessarily the name of the file on the system
     $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'});
@@ -1022 +1030 @@
 
     # should we move this to read? What about secondary plugins?
-    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
+    my $pp_file = &util::prettyprint_file($base_dir,$file,$gli);
     print STDERR "<Processing n='$file' p='$self->{'plugin_type'}'>\n" if ($gli);
     print $outhandle "$self->{'plugin_type'} processing $pp_file\n"