Changeset 28228 for main/trunk/greenstone2

Timestamp:

2013-09-05T21:17:20+12:00 (11 years ago)

Author:

ak19

Message:

For windows, need to check for short (not long) file/path names when replacing common Greenstone prefixes with placeholders and vice-versa. Tested with GS SVN and modified binary from yesterday. Need to regenerate the gs2 model collections once more.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -1300 +1300 @@
     return $path unless is_abs_path_any_os($path); # path is relative
     
-    if ($ENV{'GSDLOS'} =~ /^windows$/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
@@ -1313 +1309 @@
     $placeholder_map{$ENV{'SITEHOME'}} = '@SITEHOME@' if defined $ENV{'SITEHOME'};
 
+    $path = &util::_abspath_to_placeholders($path, \@gs_paths, \%placeholder_map);
+
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    # for windows need to look for matches on short file names too
+    # matched paths are again to be replaced with the usual placeholders
+
+    my $gsdlcollectdir = &util::downgrade_if_dos_filename($ENV{'GSDLCOLLECTDIR'});
+    my $gsdlcollecthome = &util::downgrade_if_dos_filename($ENV{'GSDLCOLLECTHOME'});
+    my $sitehome = (defined $ENV{'SITEHOME'}) ? &util::downgrade_if_dos_filename($ENV{'SITEHOME'}) : undef;
+    my $greenstonehome =  &util::downgrade_if_dos_filename($ENV{'GREENSTONEHOME'});
+
+    @gs_paths = ($gsdlcollectdir, $gsdlcollecthome, $sitehome, $greenstonehome); # order matters
+
+    %placeholder_map = ($greenstonehome => '@GSDLHOME@', # can't use double-quotes around at-sign, else perl tries to evaluate it as referring to an array
+                $gsdlcollecthome => '@COLLECTHOME@',
+                $gsdlcollectdir => '@THISCOLLECTPATH@'
+        );
+    $placeholder_map{$sitehome} = '@SITEHOME@' if defined $sitehome;
+
+    $path = &util::_abspath_to_placeholders($path, \@gs_paths, \%placeholder_map);
+    }
+
+    return $path;
+}
+
+sub _abspath_to_placeholders {
+    my ($path, $gs_paths_ref, $placeholder_map_ref) = @_;
 
     # The sequence of elements in @gs_paths matters    
@@ -1318 +1341 @@
     # to the shortest matching path (the path to gsdlhome/gsdl3home folder):
 
-    foreach my $gs_path (@gs_paths) { 
+    foreach my $gs_path (@$gs_paths_ref) { 
     next if(!defined $gs_path); # site undefined for GS2
 
@@ -1325 +1348 @@
     if($path =~ m/^$re_path/i) { # case sensitive or not for OS?
 
-        my $placeholder = $placeholder_map{$gs_path}; # get the placeholder to replace the matched path with
+        my $placeholder = $placeholder_map_ref->{$gs_path}; # get the placeholder to replace the matched path with
 
         $path =~ s/^$re_path/$placeholder/; #case sensitive or not?
@@ -1348 +1371 @@
 
     # can't use double-quotes around at-sign, else perl tries to evaluate it as referring to an array
-    my %placeholder_to_gspath_map = ('@GSDLHOME@' => $ENV{'GREENSTONEHOME'},
-                     '@SITEHOME@' => $ENV{'SITEHOME'},
-                     '@COLLECTHOME@' => $ENV{'GSDLCOLLECTHOME'},
-                     '@THISCOLLECTPATH@' => $ENV{'GSDLCOLLECTDIR'}
-    ); # $placeholder_to_gspath_map{'@SITEHOME@'} = $ENV{'SITEHOME'} if defined $ENV{'SITEHOME'};
+    my %placeholder_to_gspath_map;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    # 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'}),
+                     '@COLLECTHOME@' => &util::downgrade_if_dos_filename($ENV{'GSDLCOLLECTHOME'}),
+                     '@THISCOLLECTPATH@' => &util::downgrade_if_dos_filename($ENV{'GSDLCOLLECTDIR'})
+    );
+    $placeholder_to_gspath_map{'@SITEHOME@'} =  &util::downgrade_if_dos_filename($ENV{'SITEHOME'}) if defined $ENV{'SITEHOME'};
+    } else {
+    %placeholder_to_gspath_map = ('@GSDLHOME@' => $ENV{'GREENSTONEHOME'},
+                      '@SITEHOME@' => $ENV{'SITEHOME'}, # can be undef
+                      '@COLLECTHOME@' => $ENV{'GSDLCOLLECTHOME'},
+                      '@THISCOLLECTPATH@' => $ENV{'GSDLCOLLECTDIR'}
+        ); # $placeholder_to_gspath_map{'@SITEHOME@'} = $ENV{'SITEHOME'} if defined $ENV{'SITEHOME'};
+    }
 
     foreach my $placeholder (@placeholders) { 
@@ -1358 +1391 @@
 
     next if(!defined $gs_path); # sitehome for GS2 is undefined
-
-    #my $sep = ($ENV{'GSDLOS'} eq "windows") ? "\\" : "/";
-    #$gs_path = $gs_path . "$sep" if ($gs_path !~ m/$sep$/); # add in any trailing separator to the path prefix
 
     if($path =~ m/^$placeholder/) {