Changeset 21559 for main/trunk/greenstone2

Timestamp:

2010-01-21T14:49:19+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed calls to GDBMUtils::gdbmDatabaseRemove() to dbutil::delete_infodb_entry(). Part of removing GDBMUtils.pm and making the code less GDBM-specific.

Location:

main/trunk/greenstone2/perllib

Files:

• inexport.pm (modified) (1 diff)
• plugins/ArchivesInfPlugin.pm (modified) (3 diffs)

main/trunk/greenstone2/perllib/inexport.pm

@@ -311 +311 @@
 
     # delete the src record
-    GDBMUtils::gdbmDatabaseRemove($arcinfo_src_filename,$file);
+    my $src_infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $arcinfo_src_filename, "append");
+    &dbutil::delete_infodb_entry("gdbm", $src_infodb_file_handle, $file);
+    &dbutil::close_infodb_write_handle("gdbm", $src_infodb_file_handle);
     
     foreach my $oid (@$oids) {

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

@@ -102 +102 @@
     if (defined $archive_info) {
     my $archive_info_filename = $self->{'archive_info_filename'};
+    my $infodb_file_handle = &dbutil::open_infodb_write_handle("gdbm", $archive_info_filename, "append");
 
         my $file_list = $archive_info->get_file_list();
@@ -113 +114 @@
         # delete
         $archive_info->delete_info($doc_oid);
-        &GDBMUtils::gdbmDatabaseRemove($archive_info_filename,$doc_oid);
+        &dbutil::delete_infodb_entry("gdbm", $infodb_file_handle, $doc_oid);
 
         my $doc_file = $subfile->[0];
@@ -135 +136 @@
     }
 
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_file_handle);
     $archive_info->save_info($archive_info_filename);
     }