Changeset 23415 for main

Timestamp:

2010-12-08T11:42:24+13:00 (13 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

File:

• main/trunk/greenstone2/perllib/plugins/HTMLPlugin.pm (modified) (2 diffs)

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

@@ -227 +227 @@
     next unless ($raw_link =~ /\S+/);
 
-    if ($raw_link !~ m@^/@ && $raw_link !~ m/^([A-Z]:?)\\/) {
+    if ($raw_link !~ m@^/@ && $raw_link !~ m/^([A-Z]:?)\\/i) {
         # Turn relative file path into full path
         my $dirname = &File::Basename::dirname($filename_full_path);
@@ -285 +285 @@
     }
 
+    $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
     $block_hash->{'file_blocks'}->{$url_original_filename} = 1;
     }