Changeset 287

Timestamp:

Mar 9, 2009, 6:55:15 PM (16 years ago)

Author:

joergs

Message:

improved filename and directory handling

File:

• trunk/dasscm/dasscm (modified) (7 diffs)

trunk/dasscm/dasscm

@@ -278 +278 @@
 }
 
+
+#
+# normalize path namens:
+#   - directories should end with "/"
+#   - use only single "/"
+#
+sub normalize_path($)
+{
+    my $path = shift || "";
+
+    if( $path =~ m|^/| ) {
+        # full path
+        if( -d $path ) {
+            # ensure, a directory ends with '/'
+            $path .= '/';
+        }
+    } elsif( -d cwd() . '/' . $path ) {
+            # ensure, a directory ends with '/'
+            $path .= '/';
+    }
+
+    # remove double (triple) slashes (/)
+    $path =~ s|/[/]*|/|g;
+
+    return $path;
+}
+
+
+
 #
 # generate from (relative) filename
@@ -301 +330 @@
     # herefore make sure, that if filename is a directory,
     # it will end by "/"
-    if ( ( -d $filename_prod ) and ( !( $filename_prod =~ m/\/$/ ) ) ) {
-        $filename_prod = $filename_prod . '/';
-    }
+    $filename_prod = normalize_path( $filename_prod );
 
     ( my $basename, my $dirname_prod ) = fileparse($filename_prod);
@@ -309 +336 @@
     # uses chdir to determine real directory in a unique way
     chdir $dirname_prod or die $!;
-    $dirname_prod = cwd() . '/';
+    $dirname_prod = normalize_path( cwd() );
     chdir $StartDirectory;
 
+    my $dirname_repo  = normalize_path( $DASSCM_REPO . "/" . $dirname_prod );
+    my $filename_repo = normalize_path( "$dirname_repo/$basename" );
+
     if ($verbose) {
-        print "dir: " . $dirname_prod . "\n";
-        print "fn: " . $basename . "\n";
-    }
-
-    my $dirname_repo  = $DASSCM_REPO . "/" . $dirname_prod;
-    my $filename_repo = "$dirname_repo/$basename";
+        print "filename_repo:  " . $filename_repo . "\n";
+        print "dirname_repo:   " . $dirname_repo ."\n";
+        print "filename_prod:  " . $filename_prod . "\n";
+        print "dirname_prod:   " . $dirname_prod . "\n"; 
+        print "basename:       " . $basename . "\n";
+    }
 
     return (
@@ -536 +566 @@
             {
                 wanted => sub {
-                    my $name = $File::Find::name;
+                    my $name = normalize_path($File::Find::name);
                     $name =~ s|^$dirname_repo||;
-                    if ( $name =~ m/\.svn/ ) {
+                    #print "($name)\n";# . $File::Find::dir . "\n";
+                    if ( not $name ) {
+                        # name string is empty (top directory).
+                        # do nothing
+                    } elsif ( $name =~ m/\.svn/ ) {
 
                         # skip svn meta data
@@ -548 +582 @@
                         push( @links, $name );
                     } elsif ( -d $_ ) {
-
-                        # directories
-                        push( @dirs, $name );
+                        #if( $name."/" eq dirname_repo ) {
+                            # directories
+                            push( @dirs, $name );
+                        #}
                     } elsif ( -f $_ ) {
 
@@ -564 +599 @@
     }
 
-    return @files;
-}
+    return ( sort( @dirs, @files ) );
+}
+
+
 
 sub svn_revert( ;$ )
@@ -1163 +1200 @@
             print OUTFILE
               "# It is intended to be used for restoring permissions\n";
+            print OUTFILE "#\n";
         } else {