--- foxridge-archiver/MPIWGStor.pm	2005/08/23 15:01:08	1.4
+++ foxridge-archiver/MPIWGStor.pm	2006/06/12 17:01:39	1.7
@@ -12,7 +12,7 @@ use vars qw(@ISA @EXPORT $VERSION
 	    $file_perm);
 use Exporter;
 
-$VERSION = 0.6.1; #  ROC 8.8.2005
+$VERSION = 0.6.2; #  ROC 10.2.2006
 
 @ISA = qw(Exporter);
 
@@ -140,25 +140,35 @@ sub ymd_date {
 # file name (the last path element) and path
 #
 sub split_file_path {
-    my ($fn) = @_;
+    my ($fn, $nodot) = @_;
 
     if ($fn =~ /^(.*)\/([^\/]+)$/) {
         return ($2, $1);
+    } 
+    # only file name
+    if ($nodot) {
+	return ($fn, '');
+    } else {
+	return ($fn, '.');
     }
-    return ($fn, '.'); # only file name
 }
 
 
 #
-# $name = sstrip($name)
+# $name = sstrip($name, $slash)
 #
 # strips leading and trailing whitespace from $name
+# replaces double slashes with single ones with $slash.
 #
 sub sstrip {
-    my ($name) = @_;
+    my ($name, $slash) = @_;
     
-    if ($name =~ /\s*(.*)\s*/) {
-	return $1;
+    if ($name =~ /^\s*(.*?)\s*$/) {
+	$name = $1;
+    }
+    if ($slash) {
+	# trim multiple slashes
+	$name =~ s/\/+/\//g;
     }
     return $name;
 }