Changeset 21620 for main/trunk/greenstone2/perllib/inexport.pm

Timestamp:

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

Author:

mdewsnip

Message:

Changed inexport.pm to use the infodbtype value from the collect.cfg file instead of hard-wiring GDBM. Part of making the code less GDBM-specific.

File:

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

main/trunk/greenstone2/perllib/inexport.pm

@@ -87 +87 @@
     my ($archive_info,$block_hash,$importdir,$archivedir,$verbosity,$incremental_mode) = @_;
 
+    # Get the infodbtype value for this collection from the arcinfo object
+    my $infodbtype = $archive_info->{'infodbtype'};
+
     # in this method, we want to know if metadata files are modified or not.
-    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir);
 
     my $archiveinf_timestamp = -M $arcinfo_doc_filename;
@@ -286 +289 @@
     $mode_text = "reindexed";
     }
-    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-doc", $archivedir);
-    my $arcinfo_src_filename = &dbutil::get_infodb_file_path("gdbm", "archiveinf-src", $archivedir);
-    my $doc_infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $arcinfo_doc_filename, "append");
-    my $src_infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $arcinfo_src_filename, "append");
-
+
+    # Get the infodbtype value for this collection from the arcinfo object
+    my $infodbtype = $archive_info->{'infodbtype'};
+
+    my $arcinfo_doc_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-doc", $archivedir);
+    my $arcinfo_src_filename = &dbutil::get_infodb_file_path($infodbtype, "archiveinf-src", $archivedir);
+    my $doc_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_doc_filename, "append");
+    my $src_infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $arcinfo_src_filename, "append");
 
     # record files marked for deletion in arcinfo
@@ -297 +303 @@
     # 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'};
@@ -303 +309 @@
 
     # delete the src record
-    &dbutil::delete_infodb_entry("gdbm", $src_infodb_file_handle, $file);
+    &dbutil::delete_infodb_entry($infodbtype, $src_infodb_file_handle, $file);
     
     foreach my $oid (@$oids) {
 
         # find the source doc (the primary file that becomes this oid)
-        my $doc_rec_string = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $oid);
+        my $doc_rec_string = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
         my $doc_rec = &dbutil::convert_infodb_string_to_hash($doc_rec_string);
         my $doc_source_file = $doc_rec->{'src-file'}->[0];
@@ -329 +335 @@
         # mark oid for deletion (it will be deleted or reimported)
         $archive_info->set_status_info($oid,"D");
-        my $val = &dbutil::read_infodb_entry("gdbm", $arcinfo_doc_filename, $oid);
+        my $val = &dbutil::read_infodb_entry($infodbtype, $arcinfo_doc_filename, $oid);
         $val =~ s/^<index-status>(.*)$/<index-status>D/m;
 
         my $val_rec = &dbutil::convert_infodb_string_to_hash($val);
-        &dbutil::write_infodb_entry("gdbm", $doc_infodb_file_handle, $oid, $val_rec);
-        }
-    }
-    }
-
-    &dbutil::close_infodb_write_handle("gdbm", $doc_infodb_file_handle);
-    &dbutil::close_infodb_write_handle("gdbm", $src_infodb_file_handle);
+        &dbutil::write_infodb_entry($infodbtype, $doc_infodb_file_handle, $oid, $val_rec);
+        }
+    }
+    }
+
+    &dbutil::close_infodb_write_handle($infodbtype, $doc_infodb_file_handle);
+    &dbutil::close_infodb_write_handle($infodbtype, $src_infodb_file_handle);
 }