Changeset 18554 for gsdl/trunk/perllib

Timestamp:

2009-02-20T11:03:09+13:00 (15 years ago)

Author:

davidb

Message:

General improvements made to the printing out of information when building incrementally

File:

• gsdl/trunk/perllib/inexport.pm (modified) (5 diffs)

gsdl/trunk/perllib/inexport.pm

@@ -176 +176 @@
 }
 
-sub mark_docs_for_deletion
-{
-    my ($archive_info,$deleted_files_ref,$archivedir,$verbosity) = @_;
+
+sub _mark_docs_for_deletion
+{
+    my ($archive_info,$deleted_files_ref,$archivedir,$verbosity,$mode_text) = @_;
 
     my $db_ext = &util::is_little_endian() ? ".ldb" : ".bdb";
@@ -204 +205 @@
     
         if ($verbosity>1) {
-            print STDERR "$oid ($file) marked to be deleted from index on next buildcol.pl\n";
+            print STDERR "$oid ($file) marked to be $mode_text on next buildcol.pl\n";
         }
         $archive_info->set_status_info($oid,"D");
@@ -238 +239 @@
 }
 
+
+sub mark_docs_for_deletion
+{
+    _mark_docs_for_deletion(@_,"deleted from index");
+}
 
 
@@ -276 +282 @@
         $existing_file =~ s/^$collectdir(\\|\/)?//;
         
-        print STDERR "**** Deleting existing file: $existing_file\n";
+###     print STDERR "**** Deleting existing file: $existing_file\n";
 
         push(@$reindex_files_ref,$existing_file);
@@ -283 +289 @@
     }
     
-    mark_docs_for_deletion($archive_info,$reindex_files_ref,$archivedir,$verbosity);
+    _mark_docs_for_deletion($archive_info,$reindex_files_ref,$archivedir,$verbosity, "reindex");
 
     return @$reindex_files_ref;