Changeset 17479

Show
Ignore:
Timestamp:
06.10.2008 08:22:25 (11 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/plugins/ISISPlugin.pm

    r16392 r17479  
    8888# This plugin blocks files with the suffix ".fdt" and ".xrf" 
    8989sub get_default_block_exp { 
    90     #return q^(?i)(\.fdt|\.xrf)$^; 
    91     return ""; 
     90    return q^(?i)(\.fdt|\.xrf)$^; 
     91    #return ""; 
    9292} 
    9393 
     
    124124 
    125125# we block the corresponding fdt and xrf 
    126 sub store_block_files { 
     126# a pain on windows. blocks xxx.FDT, but if actual file is xx.fdt then  
     127# complains that no plugin can process it. Have put it back to using  
     128# block exp for now 
     129sub store_block_files_tmp { 
    127130     
    128131    my $self =shift (@_); 
    129132    my ($filename_full_path, $block_hash) = @_; 
    130      
     133    print STDERR "in store block files\n"; 
    131134    $self->check_auxiliary_files($filename_full_path); 
    132135    if (-e $self->{'fdt_file_path'}) { 
     136    print STDERR "$self->{'fdt_file_path'}\n"; 
    133137    my $fdt_file = $self->{'fdt_file_path'}; 
    134138    $block_hash->{'file_blocks'}->{$fdt_file} = 1; 
    135139    } 
    136140    if (-e $self->{'xrf_file_path'}) { 
     141    print STDERR "$self->{'xrf_file_path'}\n"; 
    137142    my $xrf_file = $self->{'xrf_file_path'}; 
    138143    $block_hash->{'file_blocks'}->{$xrf_file} = 1;