Changeset 23418

Timestamp:

2010-12-08T13:47:34+13:00 (13 years ago)

Author:

davidb

Message:

A few further additions to help windows keep track of c\... and C:\... filenames

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/BasePlugin.pm (modified) (1 diff)
• plugins/HTMLPlugin.pm (modified) (1 diff)
• util.pm (modified) (2 diffs)

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

@@ -1027 +1027 @@
 
     my ($filename_full_path, $filename_no_path) = &util::get_full_filenames($base_dir, $file);
-
+    
     # create a new document
     my $doc_obj = new doc ($filename_full_path, "indexed_doc", $self->{'file_rename_method'});

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

@@ -285 +285 @@
     }
 
-    $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
+    # $url_original_filename = &util::upgrade_if_dos_filename($url_original_filename);
+    
+    
     $block_hash->{'file_blocks'}->{$url_original_filename} = 1;
+    if ($ENV{'GSDLOS'} =~ m/^windows$/) {
+        
+        my $lower_drive = $url_original_filename;
+        $lower_drive =~ s/^([A-Z]):/\l$1:/i;
+        my $upper_drive = $url_original_filename;
+        
+        $upper_drive =~ s/^([A-Z]):/\u$1:/i;
+
+##      print STDERR "**** HTML plugin, blocking: \"$lower_drive\"\n";
+##      print STDERR "**** HTML plugin, blocking: \"$upper_drive\"\n";
+        
+        $block_hash->{'file_blocks'}->{$lower_drive} = 1;
+        $block_hash->{'file_blocks'}->{$upper_drive} = 1;       
+    }
+    else {
+##      print STDERR "**** HTML plugin, blocking: $url_original_filename\n";
+        $block_hash->{'file_blocks'}->{$url_original_filename} = 1;
+    }
+        
     }
 }

main/trunk/greenstone2/perllib/util.pm

@@ -1106 +1106 @@
     }
     # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone)
-    $filename_full_path =~ s/^(.)/\l$1/;
+    $filename_full_path =~ s/^(.):/\l$1:/;
     if ((defined $and_encode) && ($and_encode)) {
         $filename_full_path = encode("utf8",$filename_full_path);
@@ -1132 +1132 @@
     # Make sure initial drive letter is lower-case (to fit in
     # with rest of Greenstone)
-    $filename_full_path =~ s/^(.)/\l$1/;
+    $filename_full_path =~ s/^(.):/\l$1:/;
     }