Changeset 21309

Timestamp:

2009-12-09T13:24:44+13:00 (14 years ago)

Author:

kjdon

Message:

plugin::removeold renamed to remove_all. deleted_files and reindex_files now get generated by new_vs_old_import_diff, call plugin::remove_some on both lists, and then mark_docs_for_deletion on both

File:

• main/trunk/greenstone2/bin/script/import.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/import.pl

@@ -577 +577 @@
     if ($removeold) {
         # occasionally, plugins may want to do something on remove old, eg pharos image indexing
-    &plugin::removeold($pluginfo, $importdir, $processor, $maxdocs, $gli);
+    &plugin::remove_all($pluginfo, $importdir, $processor, $maxdocs, $gli);
     }
     if ($manifest eq "") {
@@ -625 +625 @@
         @deleted_files = @filtered_deleted_files;
         
-        if (scalar(@deleted_files>0)) {
+        if (scalar(@deleted_files)>0) {
             print STDERR "Files deleted since last import:\n  ";
             print STDERR join("\n  ",@deleted_files), "\n";
+        
+        
+            &plugin::remove_some($pluginfo, $archivedir, \@deleted_files);
+            
+            &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@deleted_files, $archivedir,$verbosity, "delete");
         }
         
-        
-        &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@deleted_files,
-                          $archivedir,$verbosity);
-        
-        &inexport::mark_docs_for_reindex($archive_info,$block_hash,
-                         $archivedir,$verbosity);
-        
         my @reindex_files = sort keys %{$block_hash->{'reindex_files'}};
         
-        if (scalar(@reindex_files>0)) {
+        if (scalar(@reindex_files)>0) {
             print STDERR "Files to reindex since last import:\n  ";
             print STDERR join("\n  ",@reindex_files), "\n";
+            &plugin::remove_some($pluginfo, $archivedir, \@reindex_files);
+            &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@reindex_files, $archivedir,$verbosity, "reindex");
         }
-        
-        
-        # not sure if the following will work -- will the metadata data-structure be correctly initialized
-        # in the right order?
-#       foreach my $file (@new_files, @reindex_files) {
-#       &plugin::read ($pluginfo, $importdir, $file, $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
-#       }
-        
+                
         }