Changeset 23160

Timestamp:

2010-10-18T15:45:26+13:00 (14 years ago)

Author:

kjdon

Message:

member hash renamed, some tidying up

File:

• main/trunk/greenstone2/perllib/basebuildproc.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -418 +418 @@
     if ($edit_mode eq "delete") {
     # record this doc so we don't process the reconstructed doc later
-    $self->{'dont_reconstruct'}->{$doc_obj->get_OID()} = 1;
+    $self->{'dont_process_reconstructed'}->{$doc_obj->get_OID()} = 1;
     # we don't need to do anything else for the info database for a deleted document. The infodb starts from scratch each time, so no deletion is necessary
-    # do we need this??? where did num_docs come from, from reconstruction??
-    #$self->{'num_docs'} -= 1 unless ($doctype eq "classification");
     return;
     }
@@ -427 +425 @@
     if ($edit_mode eq "update") {
     # we don't want to process the reconstructed doc later, but we will process this version now.
-    $self->{'dont_reconstruct'}->{$doc_obj->get_OID()} = 1;
+    $self->{'dont_process_reconstructed'}->{$doc_obj->get_OID()} = 1;
     }
 
@@ -439 +437 @@
     if (!defined $filename) {
     # a reconstructed doc
-    $self->{'num_bytes'} += $doc_obj->get_metadata_element ($doc_obj->get_top_section (), "total_numbytes");
-    print STDERR "new numbytes = $self->{'num_bytes'}\n";
+    my $num_reconstructed_bytes = $doc_obj->get_metadata_element ($doc_obj->get_top_section (), "total_numbytes");
+    if (defined $num_reconstructed_bytes) {
+        print STDERR "adding numbytes $num_reconstructed_bytes\n";
+        $self->{'num_bytes'} += $num_reconstructed_bytes;
+    }
     }
     # classify the document
     &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
     
-    # now add all the section to the infodb.
+    # now add all the sections to the infodb.
     
     # is this a paged or a hierarchical document
@@ -596 +597 @@
     unless ($self->is_incremental_capable())
     {
-        print STDERR "outputting db entry for doc number\n";
         if ($self->{'db_level'} eq "document") {
         &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_handle, $self->{'num_docs'}, { 'section' => [ $doc_OID ] });
@@ -610 +610 @@
     } # while defined section
 
-    print STDERR "end of infodb edit\n";
 }