Changeset 10211

Timestamp:

2005-07-05T13:48:35+12:00 (19 years ago)

Author:

davidb

Message:

Introduction of filtered_rm_r(). This function is similar to rm_r() execpt it can take
two extra parameters: the first a regular expression for files to accept, the second a
regular expression to reject. If both of these are undef, then the function works like
rm_r(), consequently rm_r() is now a small wrapper to filtered_rm_r().

File:

• trunk/gsdl/perllib/util.pm (modified) (1 diff)

trunk/gsdl/perllib/util.pm

@@ -57 +57 @@
 
 
+
+# recursive removal
+sub filtered_rm_r {
+    my ($files,$file_accept_re,$file_reject_re) = @_;
+
+    my @files_array = (ref $files eq "ARRAY") ? @$files : ($files);
+
+    # recursively remove the files
+    foreach my $file (@files_array) {
+    $file =~ s/[\/\\]+$//; # remove trailing slashes
+    
+    if (!-e $file) {
+        print STDERR "util::filtered_rm_r $file does not exist\n";
+
+    } elsif ((-d $file) && (!-l $file)) { # don't recurse down symbolic link
+        # get the contents of this directory
+        if (!opendir (INDIR, $file)) {
+        print STDERR "util::filtered_rm_r could not open directory $file\n";
+        } else {
+        my @filedir = grep (!/^\.\.?$/, readdir (INDIR));
+        closedir (INDIR);
+                
+        # remove all the files in this directory
+        map {$_="$file/$_";} @filedir;
+        &filtered_rm_r (\@filedir,$file_accept_re,$file_reject_re);
+
+        if (!defined $file_accept_re && !defined $file_reject_re) {
+            # remove this directory
+            if (!rmdir $file) {
+            print STDERR "util::filtered_rm_r couldn't remove directory $file\n";
+            }
+        }
+        }
+    } else {
+        next if (defined $file_reject_re && ($file =~ m/$file_reject_re/));
+
+        if ((!defined $file_accept_re) || ($file =~ m/$file_accept_re/)) {
+        # remove this file  
+        &rm ($file);
+        }
+    }
+    }
+}
+
+
 # recursive removal
 sub rm_r {
     my (@files) = @_;
-
-    # recursively remove the files
-    foreach my $file (@files) {
-    $file =~ s/[\/\\]+$//; # remove trailing slashes
-    
-    if (!-e $file) {
-        print STDERR "util::rm_r $file does not exist\n";
-
-    } elsif ((-d $file) && (!-l $file)) { # don't recurse down symbolic link
-        # get the contents of this directory
-        if (!opendir (INDIR, $file)) {
-        print STDERR "util::rm_r could not open directory $file\n";
-        } else {
-        my @filedir = grep (!/^\.\.?$/, readdir (INDIR));
-        closedir (INDIR);
-
-        # remove all the files in this directory
-        &rm_r (map {$_="$file/$_";} @filedir);
-
-        # remove this directory
-        if (!rmdir $file) {
-            print STDERR "util::rm_r couldn't remove directory $file\n";
-        }
-        }
-
-    } else {
-        # remove this file
-        &rm ($file);
-    }
-    }
-}
+    
+    # use the more general (but reterospectively written function
+    # filtered_rm_r function()
+
+    filtered_rm_r(\@files,undef,undef); # no accept or reject expressions
+}
+
+
+
 
 # moves a file or a group of files