Changeset 17571

Timestamp:

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

Author:

kjdon

Message:

moved the make_absolute function to util.pm

File:

• gsdl/trunk/bin/script/buildcol.pl (modified) (2 diffs)

gsdl/trunk/bin/script/buildcol.pl

@@ -483 +483 @@
     else
       {
-        $archivedir = &make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir);
+        $archivedir = &util::make_absolute($ENV{'GSDLCOLLECTDIR'}, $archivedir);
       }
     # End Mod
@@ -592 +592 @@
 
 
-## @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.
-#
-sub make_absolute()
-  {
-    my ($base_dir, $dir) = @_;
-    $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;
-    return $dir;
-  }
-## make_absolute() ##