Changeset 21412 for main

Timestamp:

2010-01-04T23:11:26+13:00 (14 years ago)

Author:

davidb

Message:

Separation of different database back-ends into individual files

File:

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

main/trunk/greenstone2/perllib/arcinfo.pm

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