Changeset 21584 for main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

Timestamp:

2010-01-22T16:32:03+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed BasePlugout to use the infodbtype value from the arcinfo object passed into it, instead of being hard-wired to use GDBM. Part of making the code less GDBM-specific.

File:

• main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/plugouts/BasePlugout.pm

@@ -741 +741 @@
                      $collect_dir,$oid_files);
 
+    # Get the infodbtype value for this collection from the arcinfo object
+    my $infodbtype = $self->{'output_info'}->{'infodbtype'};
     my $output_dir = $self->{'output_dir'};
 
-    my $doc_db = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $output_dir);
-    my $src_db = &dbutil::get_infodb_file_path("gdbm", "archiveinf-src", $output_dir);
+    my $doc_db = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $output_dir);
+    my $src_db = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $output_dir);
 
     ##print STDERR "*** To set in db: \n\t$doc_db\n\t$oid\n\t$doc_db_text\n";
@@ -753 +755 @@
     $oid_files->{'sort-meta'} = [ $oid_files->{'sort-meta'} ];
 
-    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $doc_db, "append");
-    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $oid, $oid_files);
-    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $doc_db, "append");
+    &dbutil::write_infodb_entry($infodbtype, $infodb_file_handle, $oid, $oid_files);
+    &dbutil::close_infodb_write_handle($infodbtype, $infodb_file_handle);
 
     foreach my $rl (keys %$reverse_lookups) {