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

Timestamp:

2022-08-16T19:38:05+12:00 (21 months ago)

Author:

kjdon

Message:

tidy up of extrametautil, renaming some methods to make them easier to understand, removing anything unused. then modifying plugins to use new methods. Also, moved some common code to MetadataRead function, can call this from several plugins instead of duplicating code. This is an interim commit, where I have left in the old code to make it easier to track changes. Next commit will have everything tidied up.

File:

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

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

@@ -126 +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!
-    my $dc_identifier = &extrametautil::getmetadata_for_named_pos($extrametadata, $one_file, "dc.Identifier", 0);
+    #my $dc_identifier = &extrametautil::getmetadata_for_named_pos($extrametadata, $one_file, "dc.Identifier", 0);
+      my $dc_identifier = &extrametautil::getmetadatum_by_index($extrametadata, $one_file, "dc.Identifier", 0);
     next if (!defined($dc_identifier) || $dc_identifier eq "");
 
@@ -199 +200 @@
       }   
       
-      &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);
+      #&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);
+      &extrametautil::addmetadatum($extrametadata, $one_file, $field_name, $value);
     }
     #======================================================================#