Changeset 18456 for gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

Timestamp:

2009-02-03T09:48:19+13:00 (15 years ago)

Author:

davidb

Message:

Additions to support the deleting of documents from the index. Only works for indexers that support incremental building, e.g. lucene

File:

• gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm (modified) (4 diffs)

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -87 +87 @@
     my ($self) = @_;
 
-    print STDERR "*** Running ArchivesInf deinit\n";
-
     my $archive_info = $self->{'archive_info'};
 
     if (defined $archive_info) {
+    print STDERR "********* have parsed and processed an archive info file\n";
+
     my $archive_info_filename = $self->{'archive_info_filename'};
 
         my $file_list = $archive_info->get_file_list();
 
-    foreach my $subfile (@$file_list) {
+    foreach my $subfile (@$file_list) {     
         my $doc_oid = $subfile->[1];
 
         my $index_status = $archive_info->get_status_info($doc_oid);
+        print STDERR "*** Updating $doc_oid $index_status\n";
+
         if ($index_status eq "D") {
         # delete
@@ -203 +205 @@
         my $tmp = &util::filename_cat ($file, $subfile->[0]);
         next if $tmp eq $file;
-        
-        # We always process the file...
+
+        my $doc_oid = $subfile->[1];
+        my $index_status = $archive_info->get_status_info($doc_oid);
+
+        my $curr_mode = $processor->get_mode();
+        my $new_mode = $curr_mode;
+
+        # Start by assuming we want to process the file...
         my $process_file = 1;
 
@@ -211 +219 @@
         {
             # Check to see if the file needs indexing
-        my $doc_oid = $subfile->[1];
-        my $index_status = $archive_info->get_status_info($doc_oid);
         if ($index_status eq "B")
         {
@@ -218 +224 @@
             $process_file = 0;
         }
+        elsif ($index_status eq "D") {
+            # Need to be delete it from the index.
+            $new_mode = $curr_mode."delete";
+            $process_file = 1;
+        }
+        elsif ($index_status eq "R") {
+            # Need to be delete it from the index.
+            $new_mode = $curr_mode."reindex";
+            $process_file = 1;
+        }
+        }
+        # ... or we're being asked to delete it (in which case skip it)
+        elsif ($index_status eq "D") {
+        # Delete it somehow from archives dir!!
+        # => get short name, lop off filename, concat archivedir
+        # move to recyle bin
+
+        $process_file = 0;
         }
 
         if ($process_file) {
         # note: metadata is not carried on to the next level
+        
+        $processor->set_mode($new_mode) if ($new_mode ne $curr_mode);
+
         $count += &plugin::read ($pluginfo, $base_dir, $tmp, $block_hash, {}, $processor, $maxdocs, ($total_count+$count), $gli);
-        }
-
+
+        $processor->set_mode($curr_mode) if ($new_mode ne $curr_mode);
+        }
     }