Changeset 22037 for main/trunk/greenstone2/bin/script/import.pl

Timestamp:

2010-05-05T14:53:53+12:00 (14 years ago)

Author:

davidb

Message:

Manifest file processing upgraded to support OIDs. The code then uses the archiveinf-doc database to look up which files it uses.

File:

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

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

@@ -491 +491 @@
     print STDERR "<Import>\n" if $gli;
     
-    my $manifest_lookup = new manifest();
+    my $manifest_lookup = new manifest($collectcfg->{'infodbtype'},$archivedir);
     if ($manifest ne "") {  
     my $manifest_filename = $manifest;
@@ -617 +617 @@
         $gsdl_tmp_area = &util::filename_to_regex($gsdl_tmp_area);
         $collect_tmp_area = &util::filename_to_regex($collect_tmp_area);
-        
-        
+                  
         foreach my $df (@deleted_files) {
             next if ($df =~ m/^$gsdl_tmp_area/);
@@ -624 +623 @@
             
             push(@filtered_deleted_files,$df);
-        }
+        }       
         
-        
+
         @deleted_files = @filtered_deleted_files;
         
@@ -661 +660 @@
     else
     {
-    # process any files marked for importing
-    foreach my $file (keys %{$manifest_lookup->{'import'}}) {
-        &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli);
-    }
+    # 
+    # 1. Process delete files first
+    # 
 
     my @deleted_files = keys %{$manifest_lookup->{'delete'}};
     my @full_deleted_files = ();
 
-    foreach my $df (@deleted_files) {
-        my $full_df = &util::filename_cat($importdir,$df);
+    # ensure all filenames are absolute
+    foreach my $df (@deleted_files) {       
+        my $full_df =
+        (&util::filename_is_absolute($df)) 
+        ? $df
+        : &util::filename_cat($importdir,$df);
+
         push(@full_deleted_files,$full_df);
     }
-
+    
+    &plugin::remove_some($pluginfo, $collectcfg->{'infodbtype'}, $archivedir, \@full_deleted_files);
     &inexport::mark_docs_for_deletion($archive_info,{},
                       \@full_deleted_files,
                       $archivedir, $verbosity, "delete");
+
+
+    # 
+    # 2. Now files for reindexing
+    # 
+
+    my @reindex_files = keys %{$manifest_lookup->{'reindex'}};
+    my @full_reindex_files = ();
+
+    # ensure all filenames are absolute
+    foreach my $rf (@reindex_files) {       
+        my $full_rf =
+        (&util::filename_is_absolute($rf)) 
+        ? $rf
+        : &util::filename_cat($importdir,$rf);
+
+        push(@full_reindex_files,$full_rf);
+    }
+    
+    &plugin::remove_some($pluginfo, $collectcfg->{'infodbtype'}, $archivedir, \@full_reindex_files);
+    &inexport::mark_docs_for_deletion($archive_info,{},\@full_reindex_files, $archivedir,$verbosity, "reindex");
+
+    # And now ensure the new version of the file processed by appropriate
+    # plugin
+    foreach my $full_rf (@full_reindex_files) {
+        &plugin::read ($pluginfo, "", $full_rf, {}, {}, $processor, $maxdocs, 0, $gli);
+    }
+
+
+    # 
+    # 3. Now finally any new files
+    # 
+
+    foreach my $file (keys %{$manifest_lookup->{'index'}}) {
+        &plugin::read ($pluginfo, $importdir, $file, {}, {}, $processor, $maxdocs, 0, $gli);
+    }
+
+
     }