Changeset 21413 for main/trunk

Timestamp:

2010-01-04T23:12:32+13:00 (14 years ago)

Author:

davidb

Message:

pathname_cat() performs comparable task to filename_cat(), only used for concatenating items used in CLASSPATH and LD_LIBRARY_PATH

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/util.pm

@@ -641 +641 @@
 }
 
+
+sub pathname_cat {
+    my $first_path = shift(@_);
+    my (@pathnames) = @_;
+
+    # If first_path is not null or empty, then add it back into the list
+    if (defined $first_path && $first_path =~ /\S/) {
+    unshift(@pathnames, $first_path);
+    }
+
+    my join_char;
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $join_char = ";";
+    } else {
+    $join_char = ":";
+    }
+
+    my $pathname = join($join_char, @pathnames);
+
+    # remove duplicate slashes
+    if ($ENV{'GSDLOS'} =~ /^windows$/i) {
+    $pathname =~ s/[\\\/]+/\\/g;
+    } else {
+    $pathname =~ s/[\/]+/\//g; 
+    # DB: want a pathname abc\de.html to remain like this
+    }
+
+    return $pathname;
+}
+
+
 sub tidy_up_oid {
     my ($OID) = @_;