Changeset 17572 for gsdl/trunk/perllib/util.pm

Timestamp:

2008-10-23T09:20:46+13:00 (15 years ago)

Author:

kjdon

Message:

moved the make_absolute method to here from buildcol.pl

File:

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

gsdl/trunk/perllib/util.pm

@@ -768 +768 @@
 }
 
+## @method make_absolute()
+#
+#  Ensure the given file path is absolute in respect to the given base path.
+#
+#  @param  $base_dir A string denoting the base path the given dir must be
+#                    absolute to.
+#  @param  $dir The directory to be made absolute as a string. Note that the
+#               dir may already be absolute, in which case it will remain
+#               unchanged.
+#  @return The now absolute form of the directory as a string.
+#
+#  @author John Thompson, DL Consulting Ltd.
+#  @copy 2006 DL Consulting Ltd.
+#
+#used in buildcol.pl, doesn't work for all cases --kjdon
+sub make_absolute {
+    
+    my ($base_dir, $dir) = @_;
+    print STDERR "dir = $dir\n";
+    $dir =~ s/[\\\/]+/\//g;
+    $dir = $base_dir . "/$dir" unless ($dir =~ m|^(\w:)?/|); 
+    $dir =~ s|^/tmp_mnt||;
+    1 while($dir =~ s|/[^/]*/\.\./|/|g);
+    $dir =~ s|/[.][.]?/|/|g;
+    $dir =~ tr|/|/|s;
+    print STDERR "dir = $dir\n";
+    
+    return $dir;
+}
+## make_absolute() ##
 
 sub get_dirsep {