Changeset 24951 for main/trunk/greenstone2/perllib/plugins/OAIMetadataXMLPlugin.pm

Timestamp:

2012-01-16T17:47:14+13:00 (12 years ago)

Author:

ak19

Message:

All perlcode that accesses extrametakeys, extrametadata, extrametafile data structures has been moved into a new perl module called extrametautil.pm. The next step will be to ensure that the file_regexes used to index into these data structures are consistent (using consistent slashes, like URL style slashes).

File:

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

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

@@ -33 +33 @@
 no strict 'refs';
 
+use extrametautil;
 use MetadataXMLPlugin;
 
@@ -125 +126 @@
   {
     # Don't harvest file sets that don't have dc.Identifier set, "dc.Identifier" is usde as the key between Greenstone and OAI Server!
-    next if (!defined($extrametadata->{$one_file}->{"dc.Identifier"}->[0]) || $extrametadata->{$one_file}->{"dc.Identifier"}->[0] eq "");
+    my $dc_identifier = &extrametautil::getmetadata_for_named_pos($extrametadata, $one_file, "dc.Identifier", 0);
+    next if (!defined($dc_identifier) || $dc_identifier eq "");
 
     #======================================================================#
@@ -131 +133 @@
     #======================================================================#
     # The dc.Identifier has to be the same as the OAI record identifier 
-    my $oai_identifier = $extrametadata->{$one_file}->{"dc.Identifier"}->[0];
+    my $oai_identifier = $dc_identifier;
     
     # Now, let's get the OAI metadata
@@ -195 +197 @@
         # This might need change over once they update the Koha OAI server
         $value =~ s/\/opac\/opac\-detail\.pl\?bib\=/\/catalogue\/detail\.pl\?biblionumber\=/;
-      }
-      $extrametadata->{$one_file}->{$field_name} = [] if (!defined($extrametadata->{$one_file}->{$field_name}));
-      push(@{$extrametadata->{$one_file}->{$field_name}}, $value); 
+      }   
+      
+      &extrametautil::setmetadata_for_named_metaname($extrametadata, $one_file, $field_name, []) if (!defined (&extrametautil::getmetadata_for_named_metaname($extrametadata, $one_file, $field_name)));
+      &extrametautil::addmetadata_for_named_metaname($extrametadata, $one_file, $field_name, $value);
     }
     #======================================================================#