Changeset 21614

Timestamp:

2010-01-25T16:30:53+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed ArchivesInfPlugin.pm so it uses the infodbtype value from the collect.cfg file, instead of always using GDBM. Part of making the code less GDBM-specific.

File:

• main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm (modified) (5 diffs)

main/trunk/greenstone2/perllib/plugins/ArchivesInfPlugin.pm

@@ -100 +100 @@
 
     if (defined $archive_info) {
+        # Get the infodbtype value for this collection from the arcinfo object
+        my $infodbtype = $archive_info->{'infodbtype'};
     my $archive_info_filename = $self->{'archive_info_filename'};
-    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $archive_info_filename, "append");
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $archive_info_filename, "append");
 
         my $file_list = $archive_info->get_file_list();
@@ -113 +115 @@
         # delete
         $archive_info->delete_info($doc_oid);
-        &dbutil::delete_infodb_entry("gdbm", $infodb_file_handle, $doc_oid);
+        &dbutil::delete_infodb_entry($infodbtype, $infodb_file_handle, $doc_oid);
 
         my $doc_file = $subfile->[0];
@@ -135 +137 @@
     }
 
-    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
+    &dbutil::close_infodb_write_handle($infodbtype, $infodb_file_handle);
     $archive_info->save_info($archive_info_filename);
     }
@@ -220 +222 @@
     my $count = 0;
 
+    # This function only makes sense at build-time
+    return if (ref($processor) !~ /buildproc$/);
+
+    # Get the infodbtype value for this collection from the buildproc object
+    my $infodbtype = $processor->{'infodbtype'};
+
     # see if this has a archives information file within it
 ##    my $archive_info_filename = &util::filename_cat($base_dir,$file,"archives.inf");
-
-    my $archive_info_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", &util::filename_cat($base_dir, $file));
+    my $archive_info_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", &util::filename_cat($base_dir, $file));
 
     if (-e $archive_info_filename) {
@@ -231 +238 @@
 
     # read in the archives information file
-    my $archive_info = new arcinfo ();
+    my $archive_info = new arcinfo($infodbtype);
     $self->{'archive_info'} = $archive_info;
     $self->{'archive_info_filename'} = $archive_info_filename;