- Cleaned the comments

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index a37967ed5863c77caf877c59a025492209d25800..fc1b3b47034a3c38ed616fbd7f4322bc10a1f793 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,15 +6,15 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 10-03-2003
+# Last modified: 2003-12-02

 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 

+use CGI qw(redirect);

 use Cwd qw(abs_path);
 use Cwd qw(abs_path);

-use File::Basename;

 use File::Spec;
 
 ### Export ###
 use File::Spec;
 
 ### Export ###


@@ -23,6 +23,7 @@ use base qw(Exporter);
 
 @EXPORT = qw(check_path
              clean_path
 
 @EXPORT = qw(check_path
              clean_path

+             devedit_reload

              file_name
              upper_path);
 
              file_name
              upper_path);
 


@@ -54,17 +55,11 @@ sub check_path($$)
   # The path points to a file
   # We have to extract the directory name and create the absolute path
 
   # The path points to a file
   # We have to extract the directory name and create the absolute path
 

-  my @pathinfo = fileparse($path);
+  my $dir  = upper_path($path);
+  my $file = file_name($path);

 
 

-  # This is only to avoid errors
-
-  my $basename = $pathinfo[0] || '';
-  my $dir      = $pathinfo[1] || '';
-  my $ext      = $pathinfo[2] || '';
-
-  $dir = abs_path($dir);
-
-  $path = $dir."/".$basename.$ext;
+  $dir  = abs_path($dir);
+  $path = $dir."/".$file;

  }
  else
  {
  }
  else
  {


@@ -81,7 +76,7 @@ sub check_path($$)
 
  my $short_path = substr($path,length($root));
  $short_path =~ tr!\\!\/!;
 
  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);
  $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
 
  return ($path,$short_path);


@@ -105,9 +100,34 @@ sub clean_path($)
  return $path;
 }
 
  return $path;
 }
 

+# devedit_reload()
+#
+# Create a HTTP redirection header to load Dev-Editor
+# with some other parameters
+#
+# Params: Hash Reference (will be merged to a query string)
+#
+# Return: HTTP redirection header (Scalar Reference)
+
+sub devedit_reload($)
+{
+ my $params = shift;
+ my @list;
+
+ while(my ($param,$value) = each(%$params))
+ {
+  push(@list,$param."=".$value);
+ }
+
+ my $query  = join("&",@list);
+ my $header = redirect("http://$ENV{'HTTP_HOST'}$ENV{'SCRIPT_NAME'}?$query");
+
+ return \$header;
+}
+

 # file_name()
 #
 # file_name()
 #

-# Returns the last path of a filename
+# Returns the last path of a path

 #
 # Params: Path
 #
 #
 # Params: Path
 #


@@ -129,12 +149,7 @@ sub file_name($)
 
 # upper_path()
 #
 
 # 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 the last part of a path away

 #
 # Params: Path
 #
 #
 # Params: Path
 #


@@ -148,8 +163,7 @@ sub upper_path($)
  unless($path eq "/")
  {
   $path = substr($path,0,-1) if($path =~ m!/$!);
  unless($path eq "/")
  {
   $path = substr($path,0,-1) if($path =~ m!/$!);

-  $path = substr($path,0,rindex($path,"/"));
-  $path = $path."/";
+  $path = substr($path,0,rindex($path,"/")+1);

  }
 
  return $path;
  }
 
  return $path;