Changeset 17320

Timestamp:

2008-09-18T12:07:39+12:00 (16 years ago)

Author:

kjdon

Message:

found and fixed what I think is a bug - in the metadata structures for metadata_read, file targets are local to the current subdirectory. But when we look for directory stuff, its using path local to the base dir (import). So when add the file target into the subdir_extrametakeys, need to add on the local dir

File:

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

gsdl/trunk/perllib/plugins/DirectoryPlugin.pm

@@ -296 +296 @@
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $file, $block_hash, $in_metadata, $processor, $maxdocs, $total_count, $gli) = @_;
-    
+
     my $outhandle = $self->{'outhandle'};
     my $verbosity = $self->{'verbosity'};
@@ -412 +412 @@
         my $subdir_rec = { 're' => $subdir_re, 'md' => $md };
 
-        push(@{$subdir_extrametakeys->{$extrakey_dir}},$subdir_rec);
+        # when its 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);
     }
     }
@@ -512 +514 @@
     # Next add metadata read in XML files (if it is supplied)
     if ($additionalmetadata == 1) {
-        
         my ($filespec, $mdref);
         foreach $filespec (@extrametakeys) {
-        #print STDERR "filespec $filespec\n";
-                ## use the utf8 encoded filename to do the filename comparison
+        ## use the utf8 encoded filename to do the filename comparison
         if ($tmpfile =~ /^$filespec$/) {
             print $outhandle "File \"$subfile\" matches filespec \"$filespec\"\n"