Changeset 21618 for main/trunk/greenstone2

Timestamp:

2010-01-25T17:11:53+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed plugin::remove_some() to take the infodbtype as the second parameter, so it can find the archiveinf-src database. Part of making the code less GDBM-specific.

Location:

main/trunk/greenstone2

Files:

• bin/script/import.pl (modified) (2 diffs)
• perllib/plugin.pm (modified) (2 diffs)

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

@@ -634 +634 @@
         
         
-            &plugin::remove_some($pluginfo, $archivedir, \@deleted_files);
+            &plugin::remove_some($pluginfo, $collectcfg->{'infodbtype'}, $archivedir, \@deleted_files);
             
             &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@deleted_files, $archivedir,$verbosity, "delete");
@@ -644 +644 @@
             print STDERR "Files to reindex since last import:\n  ";
             print STDERR join("\n  ",@reindex_files), "\n";
-            &plugin::remove_some($pluginfo, $archivedir, \@reindex_files);
+            &plugin::remove_some($pluginfo, $collectcfg->{'infodbtype'}, $archivedir, \@reindex_files);
             &inexport::mark_docs_for_deletion($archive_info,$block_hash,\@reindex_files, $archivedir,$verbosity, "reindex");
         }

main/trunk/greenstone2/perllib/plugin.pm

@@ -221 +221 @@
   
 sub remove_some {
-    my ($pluginfo, $archivedir, $deleted_files) = @_;
+    my ($pluginfo, $infodbtype, $archivedir, $deleted_files) = @_;
     print STDERR "in remove some\n";
     return if (scalar(@$deleted_files)==0);
-    my $arcinfo_src_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-src", $archivedir);
+    my $arcinfo_src_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $archivedir);
 
     foreach my $file (@$deleted_files) {
@@ -230 +230 @@
     # that this file is used in (note in most cases, it's just one OID)
     
-    my $src_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_src_filename, $file);
+    my $src_rec_string = &dbutil::read_infodb_entry($infodbtype, $arcinfo_src_filename, $file);
     my $src_rec = &dbutil::convert_infodb_string_to_hash($src_rec_string);
     my $oids = $src_rec->{'oid'};