Changeset 24951 for main/trunk/greenstone2/perllib/plugins/OAIPlugin.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/OAIPlugin.pm (modified) (2 diffs)

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

@@ -27 +27 @@
 package OAIPlugin;
 
+use extrametautil;
 use unicode;
 use util;
@@ -256 +257 @@
     # extrametadata keys should be regular expressions
     $filename_for_metadata = &util::filename_to_regex($filename_for_metadata);
-    $extrametadata->{$filename_for_metadata} = $new_metadata;
-    push(@$extrametakeys, $filename_for_metadata);
-    if ($srcdoc_exists) {
-    if (!defined $extrametafile->{$filename_for_metadata}) {
-        $extrametafile->{$filename_for_metadata} = {};
+    &extrametautil::setmetadata($extrametadata, $filename_for_metadata, $new_metadata);
+    &extrametautil::addmetakey($extrametakeys, $filename_for_metadata);
+    if ($srcdoc_exists) {   
+    if (!defined &extrametautil::getmetafile($extrametafile, $filename_for_metadata)) {
+        &extrametautil::setmetafile($extrametafile, $filename_for_metadata, {});
     }
      #maps the file to full path
-    $extrametafile->{$filename_for_metadata}->{$file} = $filename_full_path;
+    &extrametautil::setmetafile_for_named_file($extrametafile, $filename_for_metadata, $file, $filename_full_path);
+    
     }
     return 1;