Changeset 23176 for main/trunk

Timestamp:

2010-10-19T15:23:38+13:00 (14 years ago)

Author:

kjdon

Message:

added delete_assoc_files. If we are asked to process a deleted or updated document, then delete the old assoc files - index/assoc/archivedir, and index/text/archivedir for lucene

Location:

main/trunk/greenstone2/perllib

Files:

• basebuildproc.pm (modified) (3 diffs)
• lucenebuildproc.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/basebuildproc.pm

@@ -420 +420 @@
     $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;
     }
@@ -426 +427 @@
     # 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);
     }
 
@@ -814 +816 @@
 }
 
+sub delete_assoc_files 
+{
+    my $self = shift (@_);
+    my ($archivedir) = @_;
+
+    my $assoc_dir = &util::filename_cat($self->{'assocdir'}, $archivedir);
+    if (-d $assoc_dir) {
+    &util::rm_r($assoc_dir);
+    }
+}

main/trunk/greenstone2/perllib/lucenebuildproc.pm

@@ -569 +569 @@
 }
 
+sub delete_assoc_files 
+{
+    my $self = shift (@_);
+    my ($archivedir) = @_;
+
+    $self->basebuildproc::delete_assoc_files(@_);
+    
+    my $assoc_dir = &util::filename_cat($self->{'build_dir'},"text", $archivedir);
+    if (-d $assoc_dir) {
+    &util::rm_r($assoc_dir);
+    } 
 
 1;