Changeset 23182 for main/trunk/greenstone2/perllib/basebuildproc.pm

Timestamp:

2010-10-20T13:12:24+13:00 (14 years ago)

Author:

kjdon

Message:

fixed up bug with deleting assoc files. Was fine for a delete, but for an update, need to delete the old ones *before* adding the new ones. And also, don't delete the lucene text doc when updating. Presumably it has already been overwritten with the correct version

File:

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

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -406 +406 @@
     $archivedir = $dir;
 
+    if ($edit_mode eq "delete") {
+        # record this doc so we don't process the reconstructed doc later
+        $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
+        $self->delete_assoc_files ($archivedir, "delete");
+        return;
+    }
+    if ($edit_mode eq "update") {
+        # we don't want to process the reconstructed doc later, but we will process this version now.
+        $self->{'dont_process_reconstructed'}->{$doc_obj->get_OID()} = 1;
+        # delete the old assoc files as they may have changed
+        $self->delete_assoc_files ($archivedir, "update");
+    }
+    
     # resolve the final filenames of the files associated with this document
+    # now save the new assoc files for an update/new doc.
     $self->assoc_files ($doc_obj, $archivedir);
     }
@@ -414 +429 @@
     my $top_section = $doc_obj->get_top_section();
     $archivedir = $doc_obj->get_metadata_element($top_section,"archivedir");
-    }
-
-    if ($edit_mode eq "delete") {
-    # record this doc so we don't process the reconstructed doc later
-    $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
-    $self->delete_assoc_files ($archivedir);
-    return;
-    }
-    
-    if ($edit_mode eq "update") {
-    # we don't want to process the reconstructed doc later, but we will process this version now.
-    $self->{'dont_process_reconstructed'}->{$doc_obj->get_OID()} = 1;
-    $self->delete_assoc_files ($archivedir);
     }
 
@@ -819 +820 @@
 {
     my $self = shift (@_);
-    my ($archivedir) = @_;
+    my ($archivedir, $edit_mode) = @_;
 
     my $assoc_dir = &util::filename_cat($self->{'assocdir'}, $archivedir);