Changeset 23249 for main

Timestamp:

2010-10-29T15:00:58+13:00 (13 years ago)

Author:

ak19

Message:

A useful debug version of the rm method which got added in when Dr Bainbridge fixed the mimetype file deleting issue (commit 23248).

Location:

main/trunk/greenstone2/perllib

Files:

• classify/List.pm (modified) (1 diff)
• util.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/classify/List.pm

@@ -270 +270 @@
         # Unicode/Collate directory.
     require Unicode::Collate;
+    #print STDERR "*** What's in INC: ".join(", ", @INC) ."\n";
     $self->{'unicode_collator'} = Unicode::Collate->new();
+    #print STDERR "Table name: ".$self->{'unicode_collator'}->{'table'}."\n";
     }
 

main/trunk/greenstone2/perllib/util.pm

@@ -59 +59 @@
 }
 
+# removes files (but not directories) - can rename this to the default
+# "rm" subroutine  when debugging the deletion of individual files.
+sub rm_debug {
+    my (@files) = @_;
+    my @filefiles = ();
+
+    # make sure the files we want to delete exist 
+    # and are regular files
+    foreach my $file (@files) {
+        if (!-e $file) {
+            print STDERR "util::rm $file does not exist\n";
+        } elsif ((!-f $file) && (!-l $file)) {
+            print STDERR "util::rm $file is not a regular (or symbolic) file\n";
+        } else { # debug message
+            unlink($file) or warn "Could not delete file $file: $!\n";
+        }
+    }
+}