Changeset 18469 for gsdl/trunk/bin/script/import.pl

Timestamp:

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

Author:

davidb

Message:

Support for reindexing a document added

File:

• gsdl/trunk/bin/script/import.pl (modified) (1 diff)

gsdl/trunk/bin/script/import.pl

@@ -572 +572 @@
     # gobal blocking pass may set up some metadata
     &plugin::file_block_read($pluginfo, $importdir, "", $block_hash, $metadata, $gli);
-    # Can now work out which files were new, already existed, and have
-    # been deleted
-
-    &inexport::new_vs_old_import_diff($archive_info,$block_hash,$importdir);
-    
-    my @deleted_files = sort keys %{$block_hash->{'deleted_files'}};
-    if (scalar(@deleted_files>0)) {
-        print STDERR "Delete files:\n  ";
-        print STDERR join("\n  ",@deleted_files), "\n";
-    }
-
-    my @new_files = sort keys %{$block_hash->{'new_files'}};
-    if (scalar(@new_files>0)) {
-        print STDERR "New files:\n  ";
-        print STDERR join("\n  ",@new_files), "\n";
-    }
-
-    &inexport::mark_docs_for_deletion($archive_info,\@deleted_files,$archivedir,
-        $verbosity);
+
+
+    if (!$removeold) {
+        # Can now work out which files were new, already existed, and have
+        # been deleted
+        
+        &inexport::new_vs_old_import_diff($archive_info,$block_hash,$importdir);
+        
+        my @deleted_files = sort keys %{$block_hash->{'deleted_files'}};
+        if (scalar(@deleted_files>0)) {
+        print STDERR "Files deleted since last import:\n  ";
+        print STDERR join("\n  ",@deleted_files), "\n";
+        }
+        
+        my @new_files = sort keys %{$block_hash->{'new_files'}};
+        if (scalar(@new_files>0)) {
+        print STDERR "New files since last import:\n  ";
+        print STDERR join("\n  ",@new_files), "\n";
+        }
+        
+        &inexport::mark_docs_for_deletion($archive_info,\@deleted_files,
+                          $archivedir,$verbosity);
+
+        my @existing_files = sort keys %{$block_hash->{'existing_files'}};
+
+        my @reindex_files
+        = &inexport::mark_docs_for_reindex($archive_info,\@existing_files,
+                           $archivedir,$verbosity);
+    }
 
     &plugin::read ($pluginfo, $importdir, "", $block_hash, $metadata, $processor, $maxdocs, 0, $gli);