Changeset 23132 for main

Timestamp:

2010-10-13T14:24:22+13:00 (14 years ago)

Author:

kjdon

Message:

for manifest files, if the user has specified Index (not Reindex) and the file already existed, then print a warning and don't process it again.

File:

• main/trunk/greenstone2/perllib/inexport.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/inexport.pm

@@ -601 +601 @@
     }
 
+    my $arcinfo_src_filename = &dbutil::get_infodb_file_path($collectcfg->{'infodbtype'}, "archiveinf-src", $archivedir);
+    my $arcinfodb_map = {};
+    &dbutil::read_infodb_file($collectcfg->{'infodbtype'}, $arcinfo_src_filename, $arcinfodb_map);
     foreach my $f (@full_new_files) {
-        $block_hash->{'new_files'}->{$f} = 1;
-    }
+        # check that we haven't seen it already
+        if (defined $arcinfodb_map->{$f}) {
+        # TODO make better warning
+        print STDERR "Warning: $f already in src archive, \n";
+        } else {
+        $block_hash->{'new_files'}->{$f} = 1;
+        }
+    }
+
+    undef $arcinfodb_map;
     }
     else {