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

Timestamp:

2009-02-06T18:19:44+13:00 (15 years ago)

Author:

davidb

Message:

Support for reindexing a document added

File:

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

gsdl/trunk/perllib/plugins/ArchivesInfPlugin.pm

@@ -90 +90 @@
 
     if (defined $archive_info) {
-    print STDERR "********* have parsed and processed an archive info file\n";
-
     my $archive_info_filename = $self->{'archive_info_filename'};
 
@@ -100 +98 @@
 
         my $index_status = $archive_info->get_status_info($doc_oid);
-        print STDERR "*** Updating $doc_oid $index_status\n";
+####        print STDERR "*** Away to Update $doc_oid $index_status\n";
 
         if ($index_status eq "D") {
         # delete
         $archive_info->delete_info($doc_oid);
+        &GDBMUtils::gdbmDatabaseRemove($archive_info_filename,$doc_oid);
         }
         elsif ($index_status =~ m/^(I|R)$/) {
@@ -215 +214 @@
         my $process_file = 1;
 
-        # ...unless the build processor is incremental capable and -incremental was specified
+        # ...unless the build processor is incremental capable and -incremental was specified, in which case we need to check its index_status flag
         if ($processor->is_incremental_capable() && $self->{'incremental'})
         {
@@ -230 +229 @@
         }
         elsif ($index_status eq "R") {
-            # Need to be delete it from the index.
+            # Need to be reindexed/replaced
             $new_mode = $curr_mode."reindex";
+
             $process_file = 1;
         }
@@ -237 +237 @@
         # ... 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
+        # Non-incremental Delete
+        # It's already been deleted from the archives directory
+        # (done during import.pl)
+        # => All we need to do here is not process it
 
         $process_file = 0;
         }
+
+        if (!$processor->is_incremental_capable() && $self->{'incremental'}) {
+        # Nag feature
+        if (!defined $self->{'incremental-warning'}) {
+            print $outhandle "\n";
+            print $outhandle "Warning: command-line option '-incremental' used with *non-incremental*\n";
+            print $outhandle "         processor '", ref $processor, "'. Some conflicts may arise.\n";
+            print $outhandle "\n";
+            sleep 10;
+            $self->{'incremental-warning'} = 1;
+        }
+        }
+
+
 
         if ($process_file) {