Changeset 28394 for main/trunk/greenstone2/perllib/util.pm

Timestamp:

2013-10-14T09:58:09+13:00 (11 years ago)

Author:

davidb

Message:

Further support for operation under Cygwin added

File:

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

main/trunk/greenstone2/perllib/util.pm

@@ -358 +358 @@
 
 
-sub pathname_cat {
-    my $first_path = shift(@_);
+sub _pathname_cat {
+    my $join_char  = shift(@_);
+    my $first_path = shift(@_); 
     my (@pathnames) = @_;
 
@@ -366 +367 @@
     unshift(@pathnames, $first_path);
     }
+
+    my $pathname = join($join_char, @pathnames);
+
+    # remove duplicate slashes
+    if ($join_char eq ";") {
+    $pathname =~ s/[\\\/]+/\\/g;
+    } else {
+    $pathname =~ s/[\/]+/\//g; 
+    # DB: want a pathname abc\de.html to remain like this
+    }
+
+    return $pathname;
+}
+
+
+sub pathname_cat {
+    my (@pathnames) = @_;
 
     my $join_char;
@@ -373 +391 @@
     $join_char = ":";
     }
-
-    my $pathname = join($join_char, @pathnames);
-
-    # remove duplicate slashes
-    if (($ENV{'GSDLOS'} =~ /^windows$/i) && ($^O ne "cygwin")) {
-    $pathname =~ s/[\\\/]+/\\/g;
+    return _pathname_cat($join_char,@pathnames);
+}
+
+
+sub javapathname_cat {
+    my (@pathnames) = @_;
+
+    my $join_char;
+
+    # Unlike pathname_cat() above, not interested if running in a Cygwin environment
+    # This is because the java we run is actually a native Windows executable
+
+    if (($ENV{'GSDLOS'} =~ /^windows$/i)) {
+    $join_char = ";";
     } else {
-    $pathname =~ s/[\/]+/\//g; 
-    # DB: want a pathname abc\de.html to remain like this
-    }
-
-    return $pathname;
-}
+    $join_char = ":";
+    }
+    return _pathname_cat($join_char,@pathnames);
+}
+
 
 
@@ -445 +470 @@
     }
 }
+