X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/7416fb4edc504143cf5888717f30ed78d57511a7..977a71a3c15adbdd99d7fd5dbbbd384891e48335:/modules/Tool.pm?ds=sidebyside diff --git a/modules/Tool.pm b/modules/Tool.pm index 75b9f31..1009640 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -6,7 +6,7 @@ package Tool; # Some shared sub routines # # Author: Patrick Canterino -# Last modified: 2003-10-27 +# Last modified: 2004-02-24 # use strict; @@ -24,6 +24,7 @@ use base qw(Exporter); @EXPORT = qw(check_path clean_path devedit_reload + equal_url file_name upper_path); @@ -76,7 +77,7 @@ sub check_path($$) my $short_path = substr($path,length($root)); $short_path =~ tr!\\!\/!; - $short_path = "/".$short_path unless($short_path =~ m!^/!); + $short_path = "/".$short_path if($short_path !~ m!^/!); $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path); return ($path,$short_path); @@ -125,9 +126,30 @@ sub devedit_reload($) return \$header; } +# equal_url() +# +# Create URL equal to a file or directory +# +# Params: 1. HTTP root +# 2. Relative path +# +# Return: Formatted link (String) + +sub equal_url($$) +{ + my ($root,$path) = @_; + my $url; + + $root =~ s!/$!!; + $path =~ s!^/!!; + $url = $root."/".$path; + + return $url; +} + # file_name() # -# Returns the last path of a path +# Return the last path of a path # # Params: Path # @@ -149,12 +171,7 @@ sub file_name($) # upper_path() # -# Truncate a path in one of the following ways: -# -# - If the path points to a directory, the upper directory -# will be returned. -# - If the path points to a file, the directory containing -# the file will be returned. +# Cut away the last part of a path # # Params: Path #