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

Timestamp:

2010-12-14T16:16:48+13:00 (13 years ago)

Author:

davidb

Message:

read_infodb_entry now returns a hashmap directly. Code updated to take advantage of this, and in places where the hashmap is not needed, the alternative read_infodb_rawentry is called.

File:

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

main/trunk/greenstone2/perllib/dbutil.pm

@@ -214 +214 @@
     }
 }
+
+sub read_infodb_rawentry
+{
+  my $infodb_type = shift(@_);
+  my $infodb_file_path = shift(@_);
+  my $infodb_key = shift(@_);
+
+    
+  # !! TEMPORARY: Slow and naive implementation that just reads the entire file and picks out the one value
+  # !! This will soon be replaced with database-specific versions that will use dbget etc.
+  my $infodb_map = {};
+  &read_infodb_file($infodb_type, $infodb_file_path, $infodb_map);
+  
+  return $infodb_map->{$infodb_key}; 
+}
+
 
 sub read_infodb_entry
@@ -248 +264 @@
   
   
-  
-  # !! TEMPORARY: Slow and naive implementation that just reads the entire file and picks out the one value
-  # !! This will soon be replaced with database-specific versions that will use dbget etc.
-  my $infodb_map = {};
-  &read_infodb_file($infodb_type, $infodb_file_path, $infodb_map);
-  
-  my $infodb_rec = &dbutil::convert_infodb_string_to_hash($infodb_map->{$infodb_key}); 
+  # rawentry above is currently naive implementation
+  my $raw_string = read_infodb_rawentry($infodb_type, $infodb_file_path, $infodb_key);
+  my $infodb_rec = &dbutil::convert_infodb_string_to_hash($raw_string); 
   
   return $infodb_rec;