Changeset 21857 for main

Timestamp:

2010-03-31T23:10:19+13:00 (14 years ago)

Author:

davidb

Message:

Removal of GDBM specific code in favour of write_infodb_rawentry() which is database backend agnostic

File:

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

main/trunk/greenstone2/perllib/arcinfo.pm

@@ -205 +205 @@
     my ($filename) = @_;
 
+    my $infodbtype = $self->{'infodbtype'};
+
     # Not the most efficient operation, but will do for now
 
     # read it in
     my $infodb_map = {};
-    &dbutil::read_infodb_file($self->{'infodbtype'}, $filename, $infodb_map);
+    &dbutil::read_infodb_file($infodbtype, $filename, $infodb_map);
 
     # change index-status values
@@ -227 +229 @@
 
     # write out again
-    my $infodb_handle = &dbutil::open_infodb_write_handle($self->{'infodbtype'}, $filename);
+    my $infodb_handle = &dbutil::open_infodb_write_handle($infodbtype, $filename);
     foreach my $oid ( keys %$infodb_map ) {
-    # consider making the following a method in dbutil
-    # e.g. write_infodb_rawentry($infodb_handle,$oid,$vals);
-
-    # 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($self->{'infodbtype'}, $infodb_handle);
+    my $vals = $infodb_map->{$oid};
+    &dbutil::write_infodb_rawentry($infodbtype,$infodb_handle,$oid,$vals);
+    }
+    &dbutil::close_infodb_write_handle($infodbtype, $infodb_handle);
 
 }