Changeset 32844

Timestamp:

2019-03-04T13:33:09+13:00 (5 years ago)

Author:

ak19

Message:

modified upgrade and downgrade dos filenames - getLong/ShortPathName don't work if the file doesn't exist on the file system. In this case, do the conversion on the directory, and then add the filename back on.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -863 +863 @@
     # Ensure any DOS-like filename, such as test~1.txt, has been upgraded
     # to its long (Windows) version
-    my $long_filename = Win32::GetLongPathName($filename_full_path);
-    if (defined $long_filename) {
+    # GetLongPathName doesn't work if the file doesn't exist - in this case, use the directory instead
+    
+    if (-e $filename_full_path) {
+       my $long_filename = Win32::GetLongPathName($filename_full_path);
+       if (defined $long_filename) {
         
         $filename_full_path = $long_filename;
     }
+    } else {
+     
+       my ($tailname, $dirname, $suffix)
+            = &File::Basename::fileparse($filename_full_path, "\\.[^\\.]+\$");
+        my $long_dirname = Win32::GetLongPathName($dirname);
+        if (defined $long_dirname) {
+        $filename_full_path = &FileUtils::filenameConcatenate($long_dirname, "$tailname$suffix");
+        }
+    }
+    
     # Make sure initial drive letter is lower-case (to fit in with rest of Greenstone)
     $filename_full_path =~ s/^(.):/\u$1:/;
@@ -889 +902 @@
     # Ensure the given long Windows filename is in a form that can
     # be opened by Perl => convert it to a short DOS-like filename
-
+    # GetShortPathName doesn't work if the file doesn't exist - in this case, use the directory instead
+        if (-e $filename_full_path) {
     my $short_filename = Win32::GetShortPathName($filename_full_path);
     if (defined $short_filename) {
         $filename_full_path = $short_filename;
+    }
+    } else {
+      my ($tailname, $dirname, $suffix)
+            = &File::Basename::fileparse($filename_full_path, "\\.[^\\.]+\$");
+        my $short_dirname = Win32::GetShortPathName($dirname);
+        if (defined $short_dirname) {
+        $filename_full_path = &FileUtils::filenameConcatenate($short_dirname, "$tailname$suffix");
+        }
+    
     }
     # Make sure initial drive letter is lower-case (to fit in