Changeset 22896

Timestamp:

2010-09-14T13:01:09+12:00 (14 years ago)

Author:

kjdon

Message:

fixed an odd bug. If had a metadata file directly in import folder, referring to files in a subfolder, then the metadata wouldn't be assigned. But if all of these were in a subfolder, then it would work. Problem was with local_dirname. instead of being empty for import, it was full path. Then when storing subdir_extrametakeys, local_dirname is appended to front of path to make all paths relative to base dir. But for import, this meant it was a full path. so didn't match later on. local_dirname is now empty for import folder.

File:

• main/trunk/greenstone2/perllib/plugins/DirectoryPlugin.pm (modified) (3 diffs)

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

@@ -413 +413 @@
     $base_dir_regexp =~ s/\//$os_dirsep/g;
     my $local_dirname = $dirname;
-    $local_dirname =~ s/^$base_dir_regexp($os_dirsep)//;
-    $local_dirname .= $dirsep;
-    
-    if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
-    my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
-    foreach my $ek (@$extrakeys) {
-        my $extrakeys_re  = $ek->{'re'};
-        my $extrakeys_md  = $ek->{'md'};
-        my $extrakeys_mf  = $ek->{'mf'};
-        push(@extrametakeys,$extrakeys_re);
-        $extrametadata{$extrakeys_re} = $extrakeys_md;
-        $extrametafile{$extrakeys_re} = $extrakeys_mf;
-    }
-    delete($self->{'subdir_extrametakeys'}->{$local_dirname});
-    }
-    
+    
+    $local_dirname =~ s/^$base_dir_regexp($os_dirsep)*//;
+    # if we are in import folder, then local_dirname will be empty
+    if ($local_dirname ne "") {
+    # look for extra metadata passed down from higher folders 
+    $local_dirname .= $dirsep;
+    if (defined $self->{'subdir_extrametakeys'}->{$local_dirname}) {
+        my $extrakeys = $self->{'subdir_extrametakeys'}->{$local_dirname};
+        foreach my $ek (@$extrakeys) {
+        my $extrakeys_re  = $ek->{'re'};
+        my $extrakeys_md  = $ek->{'md'};
+        my $extrakeys_mf  = $ek->{'mf'};
+        push(@extrametakeys,$extrakeys_re);
+        $extrametadata{$extrakeys_re} = $extrakeys_md;
+        $extrametafile{$extrakeys_re} = $extrakeys_mf;
+        }
+        delete($self->{'subdir_extrametakeys'}->{$local_dirname});
+    }
+    }
     # apply metadata pass for each of the files in the directory
     my $num_files = scalar(@dir);
@@ -456 +459 @@
     # 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 for .
     $extrakey_dir =~ s/\\\\/\\/g; # remove RE syntax for \
@@ -578 +579 @@
     if ($additionalmetadata == 1) {
         foreach my $filespec (@extrametakeys) {
-        
         ## use the utf8 encoded filename to do the filename comparison
         if ($tmpfile =~ /^$filespec$/) {