Changeset 23419 for main/trunk/greenstone2/perllib/plugins/MetadataXMLPlugin.pm

Timestamp:

2010-12-09T00:10:10+13:00 (13 years ago)

Author:

max

Message:

Setting the values to store as block files is now done through an API call to BasePlugin. This way, anything uniform requirement (such as putting in both C:\... and c:\... entries for Windows) can be done in one place.

File:

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

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

@@ -214 +214 @@
     my $self = shift (@_);
     my ($pluginfo, $base_dir, $file, $block_hash, $metadata, $gli) = @_;
-
+    
     my $filename_full_path = &util::filename_cat($base_dir, $file);
     return undef unless $self->can_process_this_file($filename_full_path);    
 
-    $block_hash->{'metadata_files'}->{$filename_full_path} = 1;
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        
+        my $lower_drive = $filename_full_path;
+        $lower_drive =~ s/^([A-Z]):/\l$1:/i;
+        
+        my $upper_drive = $filename_full_path;
+        $upper_drive =~ s/^([A-Z]):/\u$1:/i;
+        
+        $block_hash->{'metadata_files'}->{$lower_drive} = 1;
+        $block_hash->{'metadata_files'}->{$upper_drive} = 1;        
+    }
+    else {
+        $block_hash->{'metadata_files'}->{$filename_full_path} = 1;
+    }
 
     return 1;
@@ -235 +248 @@
     $self->{'metadata-file'} = $file;
     $self->{'metadata-filename'} = $filename;
-
+    
     my $outhandle = $self->{'outhandle'};
     
@@ -241 +254 @@
     print $outhandle "MetadataXMLPlugin: processing $file\n" if ($self->{'verbosity'})> 1;
     # add the file to the block list so that it won't be processed in read, as we will do all we can with it here
-    $block_hash->{'file_blocks'}->{$filename} = 1;
+    $self->block_filename($block_hash,$filename);
 
     $self->{'metadataref'} = $extrametadata;