Changeset 19500 for gsdl

Timestamp:

2009-05-18T11:03:08+12:00 (15 years ago)

Author:

davidb

Message:

Code now tracks if a document needs to be re-processed on an incremental build when it's metadata has changed.

File:

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

gsdl/trunk/bin/script/import.pl

@@ -608 +608 @@
         }
         
-        &inexport::mark_docs_for_deletion($archive_info,\@deleted_files,
+        &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@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);
+        &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)) {
+        print STDERR "Files to reindex since last import:\n  ";
+        print STDERR join("\n  ",@reindex_files), "\n";
+        }
+
+
+        # not sure if the following will work -- wil the metadata datastructure 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);
+#       }
+
+
+        # Play it safe, and run through the entire folder, only processing new or edited files
+        &plugin::read ($pluginfo, $importdir, "", $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
+
+    }
+    else {
+        &plugin::read ($pluginfo, $importdir, "", $block_hash, $metadata, $processor, $maxdocs, 0, $gli);
+    }
+
     }
     else
@@ -629 +647 @@
     my @deleted_files = keys %{$manifest_lookup->{'delete'}};
 
-    &inexport::mark_docs_for_deletion($archive_info,\@deleted_files,$archivedir);
+    &inexport::mark_docs_for_deletion($archive_info,{},\@deleted_files,$archivedir);
     }