Changeset 17313

Timestamp:

2008-09-18T09:02:39+12:00 (16 years ago)

Author:

kjdon

Message:

this seemed to have been forgotten in the 'removing metadata form metadata_read' commit. Also, added ~ to block_exp so that tilda files are not processed and don't show up as errors

File:

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

gsdl/trunk/perllib/plugins/DirectoryPlugin.pm

@@ -132 +132 @@
     my $self = shift (@_);
     
-    return '(?i)(CVS|\.svn|Thumbs\.db)';
+    return '(?i)(CVS|\.svn|Thumbs\.db|~$)';
 }
 
@@ -370 +370 @@
     
     # apply metadata pass for each of the files in the directory
-    my $out_metadata; 
     my $num_files = scalar(@dir);
     for (my $i = 0; $i < scalar(@dir); $i++) {
@@ -389 +388 @@
     $count += &plugin::metadata_read ($pluginfo, $this_file_base_dir,
                       $file_subfile,$block_hash,
-                      $out_metadata, \@extrametakeys, \%extrametadata,
+                      \@extrametakeys, \%extrametadata,
                       $processor, $maxdocs, $gli);
     $additionalmetadata = 1;
@@ -465 +464 @@
         next;
     }
-    
+    #print STDERR "processing $full_filename\n";
     # Follow Windows shortcuts
     if ($subfile =~ /(?i)\.lnk$/ && $ENV{'GSDLOS'} =~ /^windows$/i) {
@@ -500 +499 @@
 
     # Make a copy of $in_metadata to pass to $subfile
-    $out_metadata = {};
+    my $out_metadata = {};
     &metadatautil::combine_metadata_structures($out_metadata, $in_metadata);
 
@@ -507 +506 @@
         &metadatautil::combine_metadata_structures($out_metadata, $self->{'assocfile_info'}->{$full_filename});
     }
-        ## encode the filename as perl5 doesn't handle unicode filenames       
+        ## encode the filename as perl5 doesn't handle unicode filenames    
+       
         my $tmpfile = Encode::encode_utf8($subfile); 
-
+    #print STDERR "subfile = $subfile, tmpfile = $tmpfile\n";
     # Next add metadata read in XML files (if it is supplied)
     if ($additionalmetadata == 1) {
@@ -515 +515 @@
         my ($filespec, $mdref);
         foreach $filespec (@extrametakeys) {
+        #print STDERR "filespec $filespec\n";
                 ## use the utf8 encoded filename to do the filename comparison
         if ($tmpfile =~ /^$filespec$/) {