Removed the $VERSION variable. The version number of Dev-Editor is now found in the...

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 47b73e660dcf5069cc2de8b1b1c2f0431970d402..75b9f31b6c8e247e7f9342b466f490d2abfae3e8 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,17 +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: 09-22-2003
+# Last modified: 2003-10-27

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

-use Carp qw(croak);
-
+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 ###


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

-             filemode
+             devedit_reload
+             file_name

              upper_path);
 
 # check_path()
              upper_path);
 
 # check_path()


@@ -56,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);
-
-  # This is only to avoid errors
-
-  my $basename = $pathinfo[0] || '';
-  my $dir      = $pathinfo[1] || '';
-  my $ext      = $pathinfo[2] || '';
-
-  $dir = abs_path($dir);
+  my $dir  = upper_path($path);
+  my $file = file_name($path);

 
 

-  $path = $dir."/".$basename.$ext;
+  $dir  = abs_path($dir);
+  $path = $dir."/".$file;

  }
  else
  {
  }
  else
  {


@@ -107,32 +100,51 @@ sub clean_path($)
  return $path;
 }
 
  return $path;
 }
 

-# filemode()
+# 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()

 #
 #

-# Creates a readable string of a UNIX filemode number
-# (copied from Tool.pm of Dev-Editor 0.1.4)
+# Returns the last path of a path

 #
 #

-# Params: Filemode as number
+# Params: Path

 #
 #

-# Return: Filemode as readable string
+# Return: Last part of the path

 
 

-sub filemode($)
+sub file_name($)

 {
 {

-    my ($modestring, $ur, $uw, $ux, $gr, $gw, $gx, $or, $ow, $ox);
-    my $mode = shift;
-
-    $ur = ($mode & 0400) ? "r" : "-";       # User Read
-    $uw = ($mode & 0200) ? "w" : "-";       # User Write
-    $ux = ($mode & 0100) ? "x" : "-";       # User eXecute
-    $gr = ($mode & 0040) ? "r" : "-";       # Group Read
-    $gw = ($mode & 0020) ? "w" : "-";       # Group Write
-    $gx = ($mode & 0010) ? "x" : "-";       # Group eXecute
-    $or = ($mode & 0004) ? "r" : "-";       # Other Read
-    $ow = ($mode & 0002) ? "w" : "-";       # Other Write
-    $ox = ($mode & 0001) ? "x" : "-";       # Other eXecute
-
-    # build a readable mode string (rwxrwxrwx)
-    return $ur . $uw . $ux . $gr . $gw . $gx . $or . $ow . $ox;
+ my $path =  shift;
+ $path    =~ tr!\\!/!;
+
+ unless($path eq "/")
+ {
+  $path = substr($path,0,-1) if($path =~ m!/$!);
+  $path = substr($path,rindex($path,"/")+1);
+ }
+
+ return $path;

 }
 
 # upper_path()
 }
 
 # upper_path()


@@ -156,8 +168,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;