Changeset 23116 for main/trunk/greenstone2/perllib/classify/Hierarchy.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/Hierarchy.pm (modified) (3 diffs)

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

@@ -86 +86 @@
 sub auto_classify {
     my $self = shift (@_);
-    my ($doc_obj,$edit_mode,$nosort,$sortmeta,$metavalues) = @_;
+    my ($doc_obj,$nosort,$sortmeta,$metavalues) = @_;
 
     my $doc_OID = $doc_obj->get_OID();
-
-    if (($edit_mode eq "delete") || ($edit_mode eq "update")) {
-    if ($nosort) {
-        $self->oid_array_delete($doc_OID,'docs');
-    }
-    else {
-        $self->oid_hash_delete($doc_OID,'docs');
-    }
-    return if ($edit_mode eq "delete");
-    }
 
     #Add all the metadata values to the hash
@@ -143 +133 @@
 sub classify {
     my $self = shift (@_);
-    my ($doc_obj,$edit_mode) = @_;
+    my ($doc_obj) = @_;
 
     my $doc_OID = $doc_obj->get_OID();
@@ -185 +175 @@
 
     if (defined $self->{'subjectfile'}) {
-    $self->hfile_classify($doc_obj,$edit_mode,$sortmeta,$metavalues);
+    $self->hfile_classify($doc_obj,$sortmeta,$metavalues);
     }
     else {
-    $self->auto_classify($doc_obj,$edit_mode,$nosort,$sortmeta,$metavalues);
+    $self->auto_classify($doc_obj,$nosort,$sortmeta,$metavalues);
     }
 }