Changeset 23415

Show
Ignore:
Timestamp:
08.12.2010 11:42:24 (8 years ago)
Author:
davidb
Message:

More careful handling of filenames going into 'block' hash. On Windows want to make sure we are consistently dealing with either C: or c: filenames

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm

    r23392 r23415  
    227227    next unless ($raw_link =~ /\S+/); 
    228228 
    229     if ($raw_link !~ m@^/@ && $raw_link !~ m/^([A-Z]:?)\\/) { 
     229    if ($raw_link !~ m@^/@ && $raw_link !~ m/^([A-Z]:?)\\/i) { 
    230230        # Turn relative file path into full path 
    231231        my $dirname = &File::Basename::dirname($filename_full_path); 
     
    285285    } 
    286286 
     287    $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename); 
    287288    $block_hash->{'file_blocks'}->{$url_original_filename} = 1; 
    288289    }