Changeset 23371 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2010-12-02T00:36:37+13:00 (13 years ago)

Author:

davidb

Message:

Further refinement of code to support HTML linking between documents when using non-ascii names on Windows

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -1030 +1030 @@
     my ($filename,$within_dir) = @_;
     
-    my $dirsep = &util::get_dirsep();
-    if ($within_dir !~ m/$dirsep$/) {
+    if ($within_dir !~ m/[\/\\]$/) {
+    my $dirsep = &util::get_dirsep();
     $within_dir .= $dirsep;
     }
     
     $within_dir =~ s/\\/\\\\/g; # escape DOS style file separator
-    
+
     if ($filename =~ m/^$within_dir(.*)$/) {
     $filename = $1;
@@ -1093 +1093 @@
 sub upgrade_if_dos_filename
 {
-    my ($filename_full_path) = @_;
+    my ($filename_full_path,$and_encode) = @_;
 
     if ($ENV{'GSDLOS'} =~ m/^windows$/i) {
@@ -1102 +1102 @@
     # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone)
     $filename_full_path =~ s/^(.)/\l$1/;
+    if ((defined $and_encode) && ($and_encode)) {
+        $filename_full_path = encode("utf8",$filename_full_path);
+    }
     }