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

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

@@ -33 +33 @@
 use strict;
 no strict 'refs';
+
+use extrametautil;
 use multiread;
 
@@ -205 +207 @@
     $csv_line_filename = &util::filename_to_regex($csv_line_filename);
 
-    $extrametadata->{$csv_line_filename} = \%csv_line_metadata;
-    push(@$extrametakeys, $csv_line_filename);
+    &extrametautil::setmetadata($extrametadata, $csv_line_filename, \%csv_line_metadata);
+    &extrametautil::addmetakey($extrametakeys, $csv_line_filename);
     # record which file the metadata came from 
-    if (!defined $extrametafile->{$csv_line_filename}) {
-        $extrametafile->{$csv_line_filename} = {};
+    if (!defined &extrametautil::getmetafile($extrametafile, $csv_line_filename)) {
+        &extrametautil::setmetafile($extrametafile, $csv_line_filename, {});
     }
     # maps the file to full path
-    $extrametafile->{$csv_line_filename}->{$file} = $filename;
+    &extrametautil::setmetafile_for_named_file($extrametafile, $csv_line_filename, $file, $filename);
     }
 }