Changeset 18554

Show
Ignore:
Timestamp:
20.02.2009 11:03:09 (11 years ago)
Author:
davidb
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/perllib/inexport.pm

    r18528 r18554  
    176176} 
    177177 
    178 sub mark_docs_for_deletion 
    179 { 
    180     my ($archive_info,$deleted_files_ref,$archivedir,$verbosity) = @_; 
     178 
     179sub _mark_docs_for_deletion 
     180{ 
     181    my ($archive_info,$deleted_files_ref,$archivedir,$verbosity,$mode_text) = @_; 
    181182 
    182183    my $db_ext = &util::is_little_endian() ? ".ldb" : ".bdb"; 
     
    204205     
    205206        if ($verbosity>1) { 
    206             print STDERR "$oid ($file) marked to be deleted from index on next buildcol.pl\n"; 
     207            print STDERR "$oid ($file) marked to be $mode_text on next buildcol.pl\n"; 
    207208        } 
    208209        $archive_info->set_status_info($oid,"D"); 
     
    238239} 
    239240 
     241 
     242sub mark_docs_for_deletion 
     243{ 
     244    _mark_docs_for_deletion(@_,"deleted from index"); 
     245} 
    240246 
    241247 
     
    276282        $existing_file =~ s/^$collectdir(\\|\/)?//; 
    277283         
    278         print STDERR "**** Deleting existing file: $existing_file\n"; 
     284###     print STDERR "**** Deleting existing file: $existing_file\n"; 
    279285 
    280286        push(@$reindex_files_ref,$existing_file); 
     
    283289    } 
    284290     
    285     mark_docs_for_deletion($archive_info,$reindex_files_ref,$archivedir,$verbosity); 
     291    _mark_docs_for_deletion($archive_info,$reindex_files_ref,$archivedir,$verbosity, "reindex"); 
    286292 
    287293    return @$reindex_files_ref;