Changeset 22074 for main/trunk

Timestamp:

2010-05-11T15:13:50+12:00 (14 years ago)

Author:

kjdon

Message:

extrametadata needs the filename with no subfolder as that is added in later. So pass in plain file name to extractEmbeddedMetadata instead of eg folder/file.jpg. Also, don't try and process folders, or each file inside it will get some exif error metadata attached

File:

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

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

@@ -97 +97 @@
     my $self = shift(@_);
     my ($file, $filename, $extrametadata, $extrametakeys) = @_;
-
+ 
     my %exif_metadata = ();
 
@@ -159 +159 @@
     # Protect windows directory chars \
     $file = &util::filename_to_regex($file);
-    # print STDERR "**** file = $file\n";
-
+    
     # Associate the metadata now
 
@@ -176 +175 @@
       $processor, $maxdocs, $gli) = @_;
   
-
-
-  # See if we are looking at a PDF file... which may contain EXIF
-  my $filename = &util::filename_cat($base_dir, $file);
-#  if ($filename !~ /\.pdf$/i || !-f $filename)
-#    {
-#      return undef;
-#    }
-
+  my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
+  
+  # we don't want to process directories
+  if (!-f $filename_full_path) {
+      return undef;
+  }
   print STDERR "\n<Processing n='$file' p='EmbeddedMetadataPlugin'>\n" if ($gli);
   print STDERR "EmbeddedMetadataPlugin: processing $file\n" if ($self->{'verbosity'}) > 1;
 
 
-  $self->extractEmbeddedMetadata($file,$filename,
+  $self->extractEmbeddedMetadata($filename_no_path,$filename_full_path,
                  $extrametadata,$extrametakeys);