Changeset 8737

Timestamp:

2004-12-03T17:32:01+13:00 (19 years ago)

Author:

davidb

Message:

Extension to RecPlug so metadata that goes with a file that is in a
sub (or subsub ..) directory can gets bound to it correctly.

File:

• trunk/gsdl/perllib/plugins/RecPlug.pm (modified) (6 diffs)

trunk/gsdl/perllib/plugins/RecPlug.pm

@@ -98 +98 @@
 use util;
 
+use File::Basename;
+
 
 BEGIN {
@@ -159 +161 @@
     }
 
+    $self->{'subdir_extrametakeys'} = {};
+
     return bless $self, $class;
 }
@@ -248 +252 @@
     my %extrametadata;               # maps from filespec to extra metadata keys
     my @extrametakeys;               # keys of %extrametadata in order read
+
+    my $dirsepre = &util::get_re_dirsep();
+    my $dirsep    = &util::get_dirsep();
+    my $local_dirname = $dirname;
+    $local_dirname =~ s/^$base_dir($dirsepre)//;
+    $local_dirname .= $dirsep;
+
+    if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
+    print STDERR "**** Matching on dirname = $local_dirname\n";
+    my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
+    foreach my $ek (@$extrakeys) {
+        my $extrakeys_re  = $ek->{'re'};
+        my $extrakeys_md  = $ek->{'md'};
+        push(@extrametakeys,$extrakeys_re);
+        $extrametadata{$extrakeys_re} = $extrakeys_md;
+    }
+    delete($self->{'subdir_extrametakeys'}->{$local_dirname});
+    }
 
     if ($read_metadata_files) {
@@ -280 +302 @@
     }
    
+    # filter out any extrametakeys that mention subdirectories and store
+    # for later use (i.e. when that sub-directory is being processed)
+
+    foreach my $ek (@extrametakeys) {
+    my ($subdir_re,$extrakey_dir) = &File::Basename::fileparse($ek);
+    $extrakey_dir =~ s/\\\./\./g; # remove RE syntax
+
+    my $dirsep = &util::get_dirsep();
+
+    if ($ek =~ m/$dirsep/) { # specifies at least one directory
+        my $md = $extrametadata{$ek};
+
+        my $subdir_extrametakeys = $self->{'subdir_extrametakeys'};
+        print STDERR "*** pushing on $subdir_re for $extrakey_dir\n";
+
+        my $subdir_rec = { 're' => $subdir_re, 'md' => $md };
+        push(@{$subdir_extrametakeys->{$extrakey_dir}},$subdir_rec);
+    }
+    }
     
     # import each of the files in the directory
@@ -501 +542 @@
 # Afterwards $mdref1 will be updated, and $mdref2 will be unchanged.
 #
-# We have to be acreful about the way we merge metadata when one metadata
+# We have to be careful about the way we merge metadata when one metadata
 # structure is in "override" mode and one is in "merge" mode.  In fact, we
 # use the mode from the second structure, $mdref2, because it is generally
@@ -509 +550 @@
 # Another issue is the use of references to pass metadata around.  If we
 # simply copy one metadata structure reference to another, then we're
-# effectively justr copyinga pointer, and changes to the new referene
+# effectively just copyinga pointer, and changes to the new referene
 # will affect the old (copied) one also.  This also applies to ARRAY
 # references used as metadata element values (hence the "clonedata"