Changeset 23399 for main/trunk/greenstone2/perllib/dbutil/sqlite.pm

Timestamp:

2010-12-07T16:55:10+13:00 (13 years ago)

Author:

max

Message:

Added (for GDBM and Sqlite) set_infodb_entry to directly change one value in the database. Print statements added to other versions of function, alterting that they are not implemented.

Also added read_infodb_rawentry. Plus, more efficient way of accessing a single record from Sqlite.

File:

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

main/trunk/greenstone2/perllib/dbutil/sqlite.pm

@@ -37 +37 @@
 {
   my $infodb_file_path = shift(@_);
-
+  my $opt_append = shift(@_);
+ 
   my $sqlite3_exe = &util::filename_cat($ENV{'GSDLHOME'},"bin",$ENV{'GSDLOS'}, "sqlite3" . &util::get_os_exe());
   my $infodb_handle = undef;
@@ -56 +57 @@
   binmode($infodb_handle,":utf8");
 
+  if (!(defined $opt_append) || ($opt_append ne "append")) {
+    print $infodb_handle "DROP TABLE IF EXISTS data;\n";
+    print $infodb_handle "DROP TABLE IF EXISTS document_metadata;\n";
+  }
+   
   print $infodb_handle "CREATE TABLE IF NOT EXISTS data (key TEXT PRIMARY KEY, value TEXT);\n";
   print $infodb_handle "CREATE TABLE IF NOT EXISTS document_metadata (id INTEGER PRIMARY KEY, docOID TEXT, element TEXT, value TEXT);\n";
@@ -161 +167 @@
       $infodb_map->{$key} = 1;
   }
+}
+
+sub read_infodb_rawentry
+{
+  my $infodb_file_path = shift(@_);
+  my $infodb_key = shift(@_);
+
+  
+  my $key_safe = &sqlite_safe($infodb_key);
+  my $select_val_cmd = "SELECT value FROM data WHERE key='$key_safe';";
+
+  my $val_str = read_infodb_cmd($infodb_file_path,$select_val_cmd);
+
+  return $val_str
+}
+
+sub read_infodb_entry
+{
+  my $infodb_file_path = shift(@_);
+  my $infodb_key = shift(@_);
+
+  my $val_str = read_infodb_rawentry($infodb_file_path,$infodb_key);
+  
+  my $rec_hash = &dbutil::convert_infodb_string_to_hash($val_str);
+
+  return $rec_hash;
 }
 
@@ -216 +248 @@
 }
 
-
-
 sub write_infodb_rawentry
 {
@@ -227 +257 @@
   print $infodb_handle "INSERT OR REPLACE INTO data (key, value) VALUES ('" . $safe_infodb_key . "', '" . &sqlite_safe($infodb_val) . "');\n";
 }
+
+
+sub set_infodb_entry
+{
+    my $infodb_file_path = shift(@_);
+    my $infodb_key = shift(@_);
+    my $infodb_map = shift(@_);
+    
+  my $sqlite3_exe = &util::filename_cat($ENV{'GSDLHOME'},"bin",$ENV{'GSDLOS'}, "sqlite3" . &util::get_os_exe());
+  my $infodb_handle = undef;
+  my $cmd = "\"$sqlite3_exe\" \"$infodb_file_path\"";
+
+  if (!-e "$sqlite3_exe" || !open($infodb_handle, "|$cmd"))
+  {
+      print STDERR "Unable to execute: $cmd\n";
+      print STDERR "$!\n";
+      return -1;
+  }
+  else {
+
+      binmode($infodb_handle, ":utf8");
+      write_infodb_entry($infodb_handle,$infodb_key,$infodb_map);
+      close($infodb_handle);
+  }
+
+  # Not currently checking for errors on write to DB
+  return 0;
+  
+  
+    }
+