Changeset 21543

Timestamp:

2010-01-20T15:35:51+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changing arcinfo.pm to use the general dbutil module, instead of being hard-wired to use the dbutil::gdbm module. This is the first stage of converting this to be able to use different infodbtypes.

File:

• main/trunk/greenstone2/perllib/arcinfo.pm (modified) (8 diffs)

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -42 +42 @@
 use strict;
 
-use dbutil::gdbm;
+use dbutil;
+
 
 # File format read in: OID <tab> Filename <tab> Optional-Index-Status
@@ -92 +93 @@
     my $infodb_map = {};
 
-    &dbutil::gdbm::read_infodb_file($filename,$infodb_map);
+    &dbutil::read_infodb_file("gdbm", $filename, $infodb_map);
 
     foreach my $oid ( keys %$infodb_map ) {
@@ -129 +130 @@
     my $infodb_map = {};
 
-    &dbutil::gdbm::read_infodb_keys($filename,$infodb_map);
+    &dbutil::read_infodb_keys("gdbm", $filename, $infodb_map);
 
     foreach my $file ( keys %$infodb_map ) {
@@ -162 +163 @@
     my $rev_infodb_map = {};
 
-    &dbutil::gdbm::read_infodb_file($rev_filename,$rev_infodb_map);
+    &dbutil::read_infodb_file("gdbm", $rev_filename, $rev_infodb_map);
 
     foreach my $srcfile ( keys %$rev_infodb_map ) {
@@ -199 +200 @@
     # read it in
     my $infodb_map = {};
-    &dbutil::gdbm::read_infodb_file($filename,$infodb_map);
+    &dbutil::read_infodb_file("gdbm", $filename, $infodb_map);
 
     # change index-status values
@@ -217 +218 @@
 
     # write out again
-    my $infodb_handle = &dbutil::gdbm::open_infodb_write_handle($filename);
+    my $infodb_handle = &dbutil::open_infodb_write_handle("gdbm", $filename);
     foreach my $oid ( keys %$infodb_map ) {
     # consider making the following a method in dbutil
@@ -227 +228 @@
     print $infodb_handle '-' x 70, "\n";
     }
-    &dbutil::gdbm::close_infodb_write_handle($infodb_handle);
+    &dbutil::close_infodb_write_handle("gdbm", $infodb_handle);
 
 }
@@ -239 +240 @@
     my $rev_infodb_map = $self->{'reverse-info'};
     my $rev_infodb_handle 
-    = &dbutil::gdbm::open_infodb_write_handle($rev_filename,"append");
+    = &dbutil::open_infodb_write_handle("gdbm", $rev_filename, "append");
 
     foreach my $key ( keys %$rev_infodb_map ) {
     my $val_hash = $rev_infodb_map->{$key};
-    &dbutil::gdbm::write_infodb_entry($rev_infodb_handle,$key,$val_hash);
-    }
-    &dbutil::gdbm::close_infodb_write_handle($rev_infodb_handle);
+    &dbutil::write_infodb_entry("gdbm", $rev_infodb_handle, $key, $val_hash);
+    }
+    &dbutil::close_infodb_write_handle("gdbm", $rev_infodb_handle);
 
 }