Changeset 22222 for main

Timestamp:

2010-06-02T15:59:57+12:00 (14 years ago)

Author:

kjdon

Message:

half way through the process of tidying up incremental stuff. When doing an update, don't want to increment doc count, or add OID to the doc list as its already there.

File:

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

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -415 +415 @@
     }
 
-    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");
     }
-    else {
+#    elsif ($edit_mode eq "update") {
+    # don't do anything. this assumes it will keep the same id.
+#    }
+    elsif ($edit_mode eq "delete") {
     # delete => remove this doc from browse structure
     my $del_doc_oid = $doc_obj->get_OID();
@@ -435 +438 @@
     &classify::classify_doc ($self->{'classifiers'}, $doc_obj, $edit_mode);
 
-    if (($edit_mode eq "add") || ($edit_mode eq "update")) {
+    if (($edit_mode eq "add")) {# || ($edit_mode eq "update")) {
     # this is another document
     $self->{'num_docs'} += 1 unless ($doctype eq "classification");
     }
-    else {
+    elsif ($edit_mode eq "delete") {
     # delete
     $self->{'num_docs'} -= 1 unless ($doctype eq "classification");
@@ -463 +466 @@
     my %section_infodb = ();
 
-    # update a few statistics
-    if (($edit_mode eq "add") || ($edit_mode eq "update")) {
+    # update a few statistics - how do we do update????
+    if (($edit_mode eq "add")) {# || ($edit_mode eq "update")) {
 
         $self->{'num_bytes'} += $doc_obj->get_text_length ($section);
         $self->{'num_sections'} += 1 unless ($doctype eq "classification");
     }
-    else {
+    elsif ($edit_mode eq "delete") {
         # delete
         $self->{'num_bytes'} -= $doc_obj->get_text_length ($section);
@@ -599 +602 @@
     
     if (($edit_mode eq "add") || ($edit_mode eq "update")) {
-
+        # in case of update, this will overwrite old entry??
         &dbutil::write_infodb_entry($self->{'infodbtype'}, $infodb_handle, $section_OID, \%section_infodb);
     }