Changeset 24404 for main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

Timestamp:

2011-08-12T19:35:50+12:00 (13 years ago)

Author:

ak19

Message:

Changes to perl code to do with removing the ex. prefix: ex. is only removed if it is the sole prefix (i.e. ex.dc.* prefixes are not removed).

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -965 +965 @@
 
 # returns an XML representation of the dublin core metadata
-# if dc meta is not found, try ex mete
+# if dc meta is not found, try ex meta
+# This method is not used by the DSpacePlugout, which has its
+# own method to save its dc metadata
 sub get_dc_metadata {
     my $self = shift(@_);
@@ -978 +980 @@
 
     my $explicit_dc = {};
+    my $explicit_ex_dc = {};
     my $explicit_ex = {};
 
     my $all_text="";
+    
+    # We want high quality dc metadata to go in first, so we store all the
+    # assigned dc.* values first. Then, for all those dc metadata names in
+    # the official dc set that are as yet unassigned, we look to see whether
+    # embedded ex.dc.* metadata has defined some values for them. If not,
+    # then for the same missing dc metadata names, we look in ex metadata.
+
     foreach my $data (@{$section_ptr->{'metadata'}}){
     my $escaped_value = &docprint::escape_text($data->[1]);
@@ -1002 +1012 @@
         }
 
-    } 
-    elsif (($data->[0] =~ m/^ex\./) || ($data->[0] !~ m/\./)) {
+    } elsif ($data->[0]=~ m/^ex\.dc\./) { # now look through ex.dc.* to fill in as yet unassigned fields in dc metaset
+        $data->[0] =~ m/^ex\.dc\.(.*)/;
+        my $ex_dc_element = $1;
+        my $lc_ex_dc_element = lc($ex_dc_element);
+
+        # only store the ex.dc value for this dc metaname if no dc.* was assigned for it
+        if (defined $dc_set->{$ex_dc_element}) { 
+        if (!defined $explicit_ex_dc->{$lc_ex_dc_element}) {
+            $explicit_ex_dc->{$lc_ex_dc_element} = [];
+        }
+        push(@{$explicit_ex_dc->{$lc_ex_dc_element}},$escaped_value);
+        }
+    }
+    elsif (($data->[0] =~ m/^ex\./) || ($data->[0] !~ m/\./)) { # look through ex. meta (incl. meta without prefix)
         $data->[0] =~ m/^(ex\.)?(.*)/;
-        my $ex_element =  $2;
+        my $ex_element = $2;
         my $lc_ex_element = lc($ex_element);
 
@@ -1023 +1045 @@
 
     if (!defined $explicit_dc->{$lc_k}) {
-        if (defined $explicit_ex->{$lc_k}) {
-
+        # try to find if ex.dc.* defines this dc.* meta,
+        # if not, then look for whether there's an ex.* equivalent
+
+        if (defined $explicit_ex_dc->{$lc_k}) {
+        foreach my $v (@{$explicit_ex_dc->{$lc_k}}) {
+            my $dc_element    = $lc_k;
+            my $escaped_value = $v;
+            
+            if (defined $version && ($version eq "oai_dc")) {
+            $all_text .= "   <dc:$dc_element>$escaped_value</dc:$dc_element>\n";
+            }
+            else {
+            $all_text .= '   <dcvalue element="'. $dc_element.'">'. $escaped_value. "</dcvalue>\n";
+            }           
+        }
+        } elsif (defined $explicit_ex->{$lc_k}) {
         foreach my $v (@{$explicit_ex->{$lc_k}}) {
             my $dc_element    = $lc_k;
@@ -1035 +1071 @@
             $all_text .= '   <dcvalue element="'. $dc_element.'">'. $escaped_value. "</dcvalue>\n";
             }
-            
         }
         }