Changeset 28236 for main

Timestamp:

2013-09-06T18:29:14+12:00 (11 years ago)

Author:

ak19

Message:

Added a parameter to specify whether paths on windows should be converted to long filenames or short (default is short) before getting being replaced by placeholders or when placeholders are replaced by absolute paths.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -1297 +1297 @@
 sub abspath_to_placeholders {
     my $path = shift(@_); # path to convert from absolute to one with placeholders
+    my $opt_long_or_short_winfilenames = shift(@_) || "short"; # whether we want to force use of long file names even on windows, default uses short
 
     return $path unless is_abs_path_any_os($path); # path is relative
+
+    if ($opt_long_or_short_winfilenames eq "long") {
+    $path = &util::upgrade_if_dos_filename($path); # will only do something on windows
+    }
     
     # now we know we're dealing with absolute paths and have to replace gs prefixes with placeholders
@@ -1311 +1316 @@
     $path = &util::_abspath_to_placeholders($path, \@gs_paths, \%placeholder_map);
 
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    if ($ENV{'GSDLOS'} =~ /^windows$/i && $opt_long_or_short_winfilenames eq "short") {
     # for windows need to look for matches on short file names too
     # matched paths are again to be replaced with the usual placeholders
@@ -1363 +1368 @@
 sub placeholders_to_abspath {
     my $path = shift(@_); # path that can contain placeholders to convert to resolved absolute path
+    my $opt_long_or_short_winfilenames = shift(@_) || "short"; # whether we want to force use of long file names even on windows, default uses short
 
     return $path if($path !~ m/@/); # path contains no placeholders
@@ -1372 +1378 @@
     # can't use double-quotes around at-sign, else perl tries to evaluate it as referring to an array
     my %placeholder_to_gspath_map;
-    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    if ($ENV{'GSDLOS'} =~ /^windows$/i && $opt_long_or_short_winfilenames eq "short") {
     # always replace placeholders with short file names of the absolute paths on windows?
     %placeholder_to_gspath_map = ('@GSDLHOME@' => &util::downgrade_if_dos_filename($ENV{'GREENSTONEHOME'}),