Changeset 21579

Timestamp:

2010-01-22T15:04:29+13:00 (14 years ago)

Author:

mdewsnip

Message:

Changed arcinfo.pm to take the infodb type to use for the archiveinf databases as a parameter. If this is not defined, the default infodb type from dbutil will be used (this is likely to always be gdbm). Part of making the code less GDBM-specific.

File:

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

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -54 +54 @@
 
 sub new {
-    my ($class) = @_;
-    my $self = {'info'=>{},
+    my $class = shift(@_);
+    my $infodbtype = shift(@_);
+
+    # If the infodbtype wasn't passed in, use the default from dbutil
+    if (!defined($infodbtype))
+    {
+      $infodbtype = &dbutil::get_default_infodb_type();
+    }
+
+    my $self = {'infodbtype' => $infodbtype,
+        'info'=>{},
         'reverse-info'=>{},
         'order'=>[],
@@ -93 +102 @@
     my $infodb_map = {};
 
-    &dbutil::read_infodb_file("gdbm", $filename, $infodb_map);
+    &dbutil::read_infodb_file($self->{'infodbtype'}, $filename, $infodb_map);
 
     foreach my $oid ( keys %$infodb_map ) {
@@ -130 +139 @@
     my $infodb_map = {};
 
-    &dbutil::read_infodb_keys("gdbm", $filename, $infodb_map);
+    &dbutil::read_infodb_keys($self->{'infodbtype'}, $filename, $infodb_map);
 
     foreach my $file ( keys %$infodb_map ) {
@@ -163 +172 @@
     my $rev_infodb_map = {};
 
-    &dbutil::read_infodb_file("gdbm", $rev_filename, $rev_infodb_map);
+    &dbutil::read_infodb_file($self->{'infodbtype'}, $rev_filename, $rev_infodb_map);
 
     foreach my $srcfile ( keys %$rev_infodb_map ) {
@@ -200 +209 @@
     # read it in
     my $infodb_map = {};
-    &dbutil::read_infodb_file("gdbm", $filename, $infodb_map);
+    &dbutil::read_infodb_file($self->{'infodbtype'}, $filename, $infodb_map);
 
     # change index-status values
@@ -218 +227 @@
 
     # write out again
-    my $infodb_handle = &dbutil::open_infodb_write_handle("gdbm", $filename);
+    my $infodb_handle = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $filename);
     foreach my $oid ( keys %$infodb_map ) {
     # consider making the following a method in dbutil
@@ -224 +233 @@
 
     # no need to escape, as $infodb_map->{$oid} hasn't been unescaped
+        # GDBM SPECIFIC!
     print $infodb_handle "[$oid]\n";
     print $infodb_handle $infodb_map->{$oid};
     print $infodb_handle '-' x 70, "\n";
     }
-    &dbutil::close_infodb_write_handle("gdbm", $infodb_handle);
+    &dbutil::close_infodb_write_handle($self->{'infodbtype'}, $infodb_handle);
 
 }
@@ -240 +250 @@
     my $rev_infodb_map = $self->{'reverse-info'};
     my $rev_infodb_handle 
-    = &dbutil::open_infodb_write_handle("gdbm", $rev_filename, "append");
+    = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $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::write_infodb_entry($self->{'infodbtype'}, $rev_infodb_handle, $key, $val_hash);
+    }
+    &dbutil::close_infodb_write_handle($self->{'infodbtype'}, $rev_infodb_handle);
 
 }