Changeset 23416 for main/trunk

Timestamp:

2010-12-08T11:45:11+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/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -1101 +1101 @@
     # Ensure any DOS-like filename, such as test~1.txt, has been upgraded
     # to its long (Windows) version
-    $filename_full_path = Win32::GetLongPathName($filename_full_path);
+    my $long_filename = Win32::GetLongPathName($filename_full_path);
+    if (defined $long_filename) {
+        $filename_full_path = $long_filename;
+    }
     # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone)
     $filename_full_path =~ s/^(.)/\l$1/;
@@ -1126 +1129 @@
     if (defined $short_filename) {
         $filename_full_path = $short_filename;
-
-        # Make sure initial drive letter is lower-case (to fit in
-        # with rest of Greenstone)
-        $filename_full_path =~ s/^(.)/\l$1/;
-    }
+    }
+    # Make sure initial drive letter is lower-case (to fit in
+    # with rest of Greenstone)
+    $filename_full_path =~ s/^(.)/\l$1/;
     }