Changeset 21642

Timestamp:

2010-01-26T17:10:39+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed IncrementalBuildUtils::deleteDocument() to take the infodbtype type as a parameter, instead of assuming GDBM. Part of making the code less GDBM-specific.

Location:

main/trunk/greenstone2

Files:

• bin/script/removedocument.pl (modified) (1 diff)
• perllib/IncrementalBuildUtils.pm (modified) (2 diffs)

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

@@ -28 +28 @@
 my $oid = $ARGV[1];
 
-&IncrementalBuildUtils::deleteDocument($collection, $oid);
+&IncrementalBuildUtils::deleteDocument($collection, "gdbm", $oid);
 
 exit;

main/trunk/greenstone2/perllib/IncrementalBuildUtils.pm

@@ -377 +377 @@
 sub deleteDocument()
   {
-    my ($collection, $oid) = @_;
+    my ($collection, $infodbtype, $oid) = @_;
     # Load the incremental document to go with this oid, as we need some
     # information from it.
@@ -389 +389 @@
         # Now write a blank string to this oid in the info database
     my $index_text_directory_path = &util::filename_cat($ENV{'GSDLHOME'}, "collect", $collection, "index", "text");
-    my $infodb_file_path = &dbutil::get_infodb_file_path("gdbm", $collection, $index_text_directory_path);
-    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $infodb_file_path, "append");
-    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $oid, &dbutil::convert_infodb_string_to_hash(""));
+    my $infodb_file_path = &dbutil::get_infodb_file_path($infodbtype, $collection, $index_text_directory_path);
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle($infodbtype, $infodb_file_path, "append");
+    &dbutil::write_infodb_entry($infodbtype, $infodb_file_handle, $oid, &dbutil::convert_infodb_string_to_hash(""));
         # Remove reverse lookup
-    &dbutil::write_infodb_entry("gdbm", $infodb_file_handle, $doc_num, &dbutil::convert_infodb_string_to_hash(""));
-    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
+    &dbutil::write_infodb_entry($infodbtype, $infodb_file_handle, $doc_num, &dbutil::convert_infodb_string_to_hash(""));
+    &dbutil::close_infodb_write_handle($infodbtype, $infodb_file_handle);
 
         # And remove from the database