Changeset 23116 for main/trunk/greenstone2/perllib/classify/List.pm

Timestamp:

2010-10-12T13:55:07+13:00 (14 years ago)

Author:

kjdon

Message:

for incremental build, classifiers are not really done incrementally. Previously, we reconstructed all the docs from the database, and classified them, then processed any new/edited/deleted docs, updating the classifier as necessary. Now, we process all new/updated docs, then reconstruct the docs from the database, but only classify those not changed/deleted. This means that we are only ever adding docs to a classifier, never updating or deleting. I have removed edit_mode and all code handling deleting stuff from the classifier.

File:

• main/trunk/greenstone2/perllib/classify/List.pm (modified) (6 diffs)

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

@@ -290 +290 @@
 {
     my $self = shift(@_);
-    my ($doc_obj,$edit_mode) = @_;
+    my ($doc_obj) = @_;
 
     # If "-classify_sections" is set, classify every section of the document
@@ -296 +296 @@
     my $section = $doc_obj->get_next_section($doc_obj->get_top_section());
     while (defined $section) {
-        $self->classify_section($doc_obj, $doc_obj->get_OID() . ".$section", $section, $edit_mode);
+        $self->classify_section($doc_obj, $doc_obj->get_OID() . ".$section", $section);
         $section = $doc_obj->get_next_section($section);
     }
@@ -302 +302 @@
     # Otherwise just classify the top document section
     else {
-    $self->classify_section($doc_obj, $doc_obj->get_OID(), $doc_obj->get_top_section(), $edit_mode);
+    $self->classify_section($doc_obj, $doc_obj->get_OID(), $doc_obj->get_top_section());
     }
 }
@@ -310 +310 @@
 {
     my $self = shift(@_);
-    my ($doc_obj,$section_OID,$section,$edit_mode) = @_;
+    my ($doc_obj,$section_OID,$section) = @_;
 
     my @metadata_groups = @{$self->{'metadata_groups'}};
@@ -342 +342 @@
     # We're not classifying this section because it doesn't have the required metadata
     return if (!$classify_section);
-
-    if (($edit_mode eq "delete") || ($edit_mode eq "update")) {
-    $self->oid_array_delete($section_OID,'OIDs');
-    if ($edit_mode eq "delete") {
-        return;
-    }
-    }
    
     # Otherwise, include this section in the classifier
@@ -358 +351 @@
     # Take care not to do a metadata group more than once
     unless ($metadata_groups_done{$metadata_group}) {
-        if ($edit_mode eq "update") {
-        # if we are updating, we delete all the old values before 
-        # adding the new ones, otherwise, the section will end up in 
-        # the classifier twice.
-        delete $self->{$metadata_group . ".list"}->{$section_OID};
-        }
-
         my $remove_prefix_expr = $self->{$metadata_group . ".remove_prefix_expr"};
         my $remove_suffix_expr = $self->{$metadata_group . ".remove_suffix_expr"};