Changeset 23121 for main/trunk

Timestamp:

2010-10-12T14:05:25+13:00 (14 years ago)

Author:

kjdon

Message:

small changes based on the fact that we need to store ids for updated and deleted documents so the reconstructed documents don't get processed later

File:

• main/trunk/greenstone2/perllib/basebuildproc.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -416 +416 @@
     }
 
-    if (($edit_mode eq "add")) {# || ($edit_mode eq "update")) {
+    if (($edit_mode eq "add") || ($edit_mode eq "update")) {
     #add this document to the browse structure
     push(@{$self->{'doclist'}},$doc_obj->get_OID()) 
         unless ($doctype eq "classification");
-    }
-#    elsif ($edit_mode eq "update") {
-    # don't do anything. this assumes it will keep the same id.
-#    }
+    if ($edit_mode eq "update") {
+        $self->{'dont_reconstruct'}->{$doc_obj->get_OID()} = 1;
+    }
+    &classify::classify_doc ($self->{'classifiers'}, $doc_obj);
+    $self->{'num_docs'} += 1 unless ($doctype eq "classification");
+    }
     elsif ($edit_mode eq "delete") {
-    # delete => remove this doc from browse structure
+    # record this doc so we don't process the reconstructed doc later
     my $del_doc_oid = $doc_obj->get_OID();
-
-    my @filtered_doc_list = ();
-    foreach my $oid (@{$self->{'doclist'}}) {
-        push(@filtered_doc_list,$oid) if ($oid ne $del_doc_oid);
-    }
-    $self->{'doclist'} = \@filtered_doc_list;
-    }
-
-
-    # classify this document
-    &classify::classify_doc ($self->{'classifiers'}, $doc_obj, $edit_mode);
-
-    if (($edit_mode eq "add")) {# || ($edit_mode eq "update")) {
-    # this is another document
-    $self->{'num_docs'} += 1 unless ($doctype eq "classification");
-    }
-    elsif ($edit_mode eq "delete") {
-    # delete
+    $self->{'dont_reconstruct'}->{$del_doc_oid} = 1;
+    # do we need this??? where did num_docs come from, from reconstruction??
     $self->{'num_docs'} -= 1 unless ($doctype eq "classification");
     }