Changeset 22485 for main/trunk/greenstone2/perllib/dbutil.pm

Timestamp:

2010-07-22T18:55:18+12:00 (14 years ago)

Author:

ak19

Message:

1. Dr Bainbridge fixed the database perl modules to all have the method read_info_keys (which reads the keys from the database into a map), so that dbutil.pm can have the same as a generic method. 2. buildConfigxml.pm only writes out the defaultIndex if it is set (to prevent an Uninitialised Variable warning message from Perl).

File:

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

main/trunk/greenstone2/perllib/dbutil.pm

@@ -144 +144 @@
 }
 
+# This function, conceptually, would be better structured if it didn't
+# use return statements, as the database methods it calls do not
+# themselves return anything.
+# Note: if doing this, then the GDBM lines of code should be moved into
+# an 'else' clause
 
 sub read_infodb_file
@@ -177 +182 @@
 }
 
+sub read_infodb_keys
+{
+    my $infodb_type = shift(@_);
+    my $infodb_file_path = shift(@_);
+    my $infodb_map = shift(@_);
+    
+    if ($infodb_type eq "sqlite")
+    {
+    require dbutil::sqlite;
+    &dbutil::sqlite::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "gdbm-txtgz")
+    {
+    require dbutil::gdbmtxtgz;
+    &dbutil::gdbmtxtgz::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "jdbm")
+    {
+    require dbutil::jdbm;
+    &dbutil::jdbm::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    elsif ($infodb_type eq "mssql")
+    {
+    require dbutil::mssql;
+    &dbutil::mssql::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+    else {
+    # Use GDBM if the infodb type is empty or not one of the values above
+    require dbutil::gdbm;
+    &dbutil::gdbm::read_infodb_keys($infodb_file_path, $infodb_map, @_);
+    }
+}
 
 sub read_infodb_entry