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

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

@@ -30 +30 @@
 package DirectoryPlugin;
 
+use extrametautil;
 use PrintInfo;
 use plugin;
@@ -443 +444 @@
         my $extrakeys_md  = $ek->{'md'};
         my $extrakeys_mf  = $ek->{'mf'};
-        push(@extrametakeys,$extrakeys_re);
-        $extrametadata{$extrakeys_re} = $extrakeys_md;
-        $extrametafile{$extrakeys_re} = $extrakeys_mf;
+        &extrametautil::addmetakey(\@extrametakeys, $extrakeys_re);
+        &extrametautil::setmetadata(\%extrametadata, $extrakeys_re, $extrakeys_md);
+        &extrametautil::setmetafile(\%extrametafile, $extrakeys_re, $extrakeys_mf);
         }
         delete($self->{'subdir_extrametakeys'}->{$local_dirname});
@@ -489 +490 @@
     my $ek_non_re = &util::unregex_filename($ek);
     if ($ek_non_re =~ m/$dirsep_re/) { # specifies at least one directory
-        my $md = $extrametadata{$ek};
-        my $mf = $extrametafile{$ek};
+        my $md = &extrametautil::getmetadata(\%extrametadata, $ek);
+        my $mf = &extrametautil::getmetafile(\%extrametafile, $ek);
 
         my $subdir_extrametakeys = $self->{'subdir_extrametakeys'};
@@ -496 +497 @@
         my $subdir_rec = { 're' => $subdir_re, 'md' => $md, 'mf' => $mf };
 
-        # when its looked up, it must be relative to the base dir
+        # when it's looked up, it must be relative to the base dir
         push(@{$subdir_extrametakeys->{"$local_dirname$extrakey_dir"}},$subdir_rec);
         #push(@{$subdir_extrametakeys->{"$extrakey_dir"}},$subdir_rec);
@@ -606 +607 @@
             print $outhandle "File \"$subfile\" matches filespec \"$filespec\"\n" 
             if ($verbosity > 2);
-            my $mdref = $extrametadata{$filespec};
-            my $mfref = $extrametafile{$filespec};
+            my $mdref = &extrametautil::getmetadata(\%extrametadata, $filespec);
+            my $mfref = &extrametautil::getmetafile(\%extrametafile, $filespec);
 
             # Add the list files where the metadata came from