Changeset 28213 for main/trunk

Timestamp:

2013-09-04T22:09:17+12:00 (11 years ago)

Author:

ak19

Message:

Clean up. Removed an usused new method to convert a path to its absolute version on this OS, whose equivalent already existed and tidied up the new functions to convert from absolute paths to placeholders and vice-versa.

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -1259 +1259 @@
     } 
 
-    elsif (defined $ENV{'SITEHOME'}) { #&FileUtils::filenameConcatenate(&util::get_site_dir($site),"collect");
+    elsif (defined $ENV{'SITEHOME'}) {
     return &FileUtils::filenameConcatenate($ENV{'SITEHOME'},"collect");
     }
@@ -1267 +1267 @@
     }
 }
-
-sub is_abs_path_this_os {
-    my ($path) = @_;
-
-    # File::Spec loads the module appropriate for the OS
-    return &FileUtils::isFilenameAbsolute(@_); #return File::Spec->file_name_is_absolute( $path );
-}
-
 
 sub is_abs_path_any_os {
@@ -1305 +1297 @@
     
     # now we know we're dealing with absolute paths and have to replace gs prefixes with placeholders
-
-    my $site = $ENV{'SITEHOME'} ? $ENV{'SITEHOME'} : "";
-    my @gs_paths = ($ENV{'GSDLCOLLECTDIR'}, $ENV{'GSDLCOLLECTHOME'}, $site, $ENV{'GREENSTONEHOME'}); # list in this order: from longest to shortest path
+    my @gs_paths = ($ENV{'GSDLCOLLECTDIR'}, $ENV{'GSDLCOLLECTHOME'}, $ENV{'SITEHOME'}, $ENV{'GREENSTONEHOME'}); # list in this order: from longest to shortest path
 
     my %placeholder_map = ($ENV{'GREENSTONEHOME'} => '@GSDLHOME@', # can't use double-quotes around at-sign, else perl tries to evaluate it as referring to an array
-               $site => '@SITEHOME@',
                $ENV{'GSDLCOLLECTHOME'} => '@COLLECTHOME@',
                $ENV{'GSDLCOLLECTDIR'} => '@THISCOLLECTPATH@'
     );
+    $placeholder_map{$ENV{'SITEHOME'}} = '@SITEHOME@' if defined $ENV{'SITEHOME'};
 
 
@@ -1321 +1311 @@
 
     foreach my $gs_path (@gs_paths) { 
-    next if($gs_path eq ""); # site can be empty
+    next if(!defined $gs_path); # site undefined for GS2
 
     my $re_path =  &util::filename_to_regex($gs_path); # escape for regex
@@ -1345 +1335 @@
     return $path if($path !~ m/@/); # path contains no placeholders
     
-    # replace placeholders with gs prefixes 
-    my $site = $ENV{'SITEHOME'} ? $ENV{'SITEHOME'} : "";
+    # replace placeholders with gs prefixes
     my @placeholders = ('@THISCOLLECTPATH@', '@COLLECTHOME@', '@SITEHOME@', '@GSDLHOME@'); # order of paths not crucial in this case, 
                        # but listed here from longest to shortest once placeholders are have been resolved
 
-    my %placeholder_to_gspath_map = ('@GSDLHOME@' => $ENV{'GREENSTONEHOME'}, # can't use double-quotes around at-sign, else perl tries to evaluate it as referring to an array
-               '@SITEHOME@' => $site,
-               '@COLLECTHOME@' => $ENV{'GSDLCOLLECTHOME'},
-               '@THISCOLLECTPATH@' => $ENV{'GSDLCOLLECTDIR'}
-    );
-
+    # 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'};
 
     foreach my $placeholder (@placeholders) { 
     my $gs_path = $placeholder_to_gspath_map{$placeholder};
 
-    next if($gs_path eq ""); # no value for sitehome for GS2
+    next if(!defined $gs_path); # sitehome for GS2 is undefined
 
     #my $sep = ($ENV{'GSDLOS'} eq "windows") ? "\\" : "/";