Changeset 17479

Timestamp:

2008-10-06T08:22:25+13:00 (16 years ago)

Author:

kjdon

Message:

put this back to using block expression for now - on windows sets up xx.FDT to be blocked, but then if the actual file is xx.fdt, it doesn't get blocked, and is unrecognised

File:

• gsdl/trunk/perllib/plugins/ISISPlugin.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/ISISPlugin.pm

@@ -88 +88 @@
 # This plugin blocks files with the suffix ".fdt" and ".xrf"
 sub get_default_block_exp {
-    #return q^(?i)(\.fdt|\.xrf)$^;
-    return "";
+    return q^(?i)(\.fdt|\.xrf)$^;
+    #return "";
 }
 
@@ -124 +124 @@
 
 # we block the corresponding fdt and xrf
-sub store_block_files {
+# a pain on windows. blocks xxx.FDT, but if actual file is xx.fdt then 
+# complains that no plugin can process it. Have put it back to using 
+# block exp for now
+sub store_block_files_tmp {
     
     my $self =shift (@_);
     my ($filename_full_path, $block_hash) = @_;
-    
+    print STDERR "in store block files\n";
     $self->check_auxiliary_files($filename_full_path);
     if (-e $self->{'fdt_file_path'}) {
+    print STDERR "$self->{'fdt_file_path'}\n";
     my $fdt_file = $self->{'fdt_file_path'};
     $block_hash->{'file_blocks'}->{$fdt_file} = 1;
     }
     if (-e $self->{'xrf_file_path'}) {
+    print STDERR "$self->{'xrf_file_path'}\n";
     my $xrf_file = $self->{'xrf_file_path'};
     $block_hash->{'file_blocks'}->{$xrf_file} = 1;