Changeset 28225

Timestamp:

2013-09-05T16:30:23+12:00 (11 years ago)

Author:

ak19

Message:

Another commit concerning the placeholder GS paths written into the archiveinf db files. On Windows, DOS style filenames (short file names) should be converted to long file paths in order to be able to find a match with prefixes to be replaced with standard GS placeholder prefixes

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -42 +42 @@
 use FileUtils;
 
+if ($^O =~ m/mswin/i) {
+    require Win32; # for working out Windows Long Filenames from Win 8.3 short filenames
+}
+
 # removes files (but not directories)
 sub rm {
@@ -1295 +1299 @@
 
     return $path unless is_abs_path_any_os($path); # path is relative
-    
+    
+    if ($^O =~ m/mswin/i) {
+        $path = &Win32::GetLongPathName($path); 
+    }   
+    
     # now we know we're dealing with absolute paths and have to replace gs prefixes with placeholders
     my @gs_paths = ($ENV{'GSDLCOLLECTDIR'}, $ENV{'GSDLCOLLECTHOME'}, $ENV{'SITEHOME'}, $ENV{'GREENSTONEHOME'}); # list in this order: from longest to shortest path