Changeset 22043 for main/trunk/greenstone2/common-src/src/lib/sqlitedbclass.cpp

Timestamp:

2010-05-06T12:49:54+12:00 (14 years ago)

Author:

davidb

Message:

Upgrading of database backends to allow support for sql-query support. Opportunity also taken to make calls to sql related classes (such as mssql and sqlite) to be more unified.

File:

• main/trunk/greenstone2/common-src/src/lib/sqlitedbclass.cpp (modified) (9 diffs)

main/trunk/greenstone2/common-src/src/lib/sqlitedbclass.cpp

@@ -38 +38 @@
 
 #define SQLITE_MAX_RETRIES 8
+
+sqlitedbclass::sqlitedbclass() 
+{ 
+  sqlitefile = NULL; 
+}
 
 
@@ -95 +100 @@
 void sqlitedbclass::deletekey (const text_t &key)
 {
-  text_t sql_cmd = "DELETE FROM data WHERE key='" + sqlite_safe(key) + "'";
+  text_t sql_cmd = "DELETE FROM data WHERE key='" + sql_safe(key) + "'";
   sqlexec(sql_cmd);
 }
@@ -114 +119 @@
 
   // Get the entries in the "document_metadata" table where the element and value matches those specified
-  text_t sql_cmd = "SELECT DISTINCT docOID FROM document_metadata WHERE element IN ('" + sqlite_safe(metadata_element_names[0]) + "'";
+  text_t sql_cmd = "SELECT DISTINCT docOID FROM document_metadata WHERE element IN ('" + sql_safe(metadata_element_names[0]) + "'";
   for (int i = 1; i < metadata_element_names.size(); i++)
   {
-    sql_cmd += ",'" + sqlite_safe(metadata_element_names[i]) + "'";
-  }
-  sql_cmd += ") AND value='" + sqlite_safe(metadata_value) + "'";
+    sql_cmd += ",'" + sql_safe(metadata_element_names[i]) + "'";
+  }
+  sql_cmd += ") AND value='" + sql_safe(metadata_value) + "'";
 
   // If we're sorting the documents by a certain metadata element, extend the SQL command to do this
   if (sort_by_metadata_element_name != "")
   {
-    sql_cmd = "SELECT docOID FROM (" + sql_cmd + ") LEFT JOIN (SELECT docOID,value from document_metadata WHERE element='" + sqlite_safe(sort_by_metadata_element_name) + "') USING (docOID) ORDER by value";
+    sql_cmd = "SELECT docOID FROM (" + sql_cmd + ") LEFT JOIN (SELECT docOID,value from document_metadata WHERE element='" + sql_safe(sort_by_metadata_element_name) + "') USING (docOID) ORDER by value";
   }
 
@@ -157 +162 @@
 bool sqlitedbclass::getkeydata (const text_t& key, text_t &data)
 {
-  text_t sql_cmd = "SELECT value FROM data WHERE key='" + sqlite_safe(key) + "'";
+  text_t sql_cmd = "SELECT value FROM data WHERE key='" + sql_safe(key) + "'";
   vector<text_tmap> sql_results;
   if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)
@@ -217 +222 @@
 
   // Get the entries in the "document_metadata" table where the element matches that specified
-  text_t sql_cmd = "SELECT DISTINCT docOID," + value_select_expression + " FROM document_metadata WHERE element IN ('" + sqlite_safe(metadata_element_names[0]) + "'";
+  text_t sql_cmd = "SELECT DISTINCT docOID," + value_select_expression + " FROM document_metadata WHERE element IN ('" + sql_safe(metadata_element_names[0]) + "'";
   for (int i = 1; i < metadata_element_names.size(); i++)
   {
-    sql_cmd += ",'" + sqlite_safe(metadata_element_names[i]) + "'";
+    sql_cmd += ",'" + sql_safe(metadata_element_names[i]) + "'";
   }
   sql_cmd += ")";
@@ -227 +232 @@
   if (metadata_value_filter != "")
   {
-    sql_cmd += " AND value GLOB '" + sqlite_safe(metadata_value_filter) + "'";
+    sql_cmd += " AND value GLOB '" + sql_safe(metadata_value_filter) + "'";
   }
 
@@ -256 +261 @@
   if (!exists(key))
   {
-    text_t sql_cmd = "INSERT INTO data (key, value) VALUES ('" + sqlite_safe(key) + "', '" + sqlite_safe(data) + "')";
+    text_t sql_cmd = "INSERT INTO data (key, value) VALUES ('" + sql_safe(key) + "', '" + sql_safe(data) + "')";
     return sqlexec(sql_cmd);
   }
   else
   {
-    text_t sql_cmd = "UPDATE data SET value='" + sqlite_safe(data) + "' WHERE key='" + sqlite_safe(key) + "'";
+    text_t sql_cmd = "UPDATE data SET value='" + sql_safe(data) + "' WHERE key='" + sql_safe(key) + "'";
     return sqlexec(sql_cmd);
   }
@@ -282 +287 @@
 
 
-text_t sqlitedbclass::sqlite_safe (const text_t &value_arg)
+text_t sqlitedbclass::sql_safe (const text_t &value_arg)
 {
   text_t value = value_arg;
@@ -380 +385 @@
 bool sqlitedbclass::sqltableexists(const text_t &table_name)
 {
-  text_t sql_cmd = "SELECT * FROM sqlite_master WHERE tbl_name='" + sqlite_safe(table_name) + "'";
+  text_t sql_cmd = "SELECT * FROM sqlite_master WHERE tbl_name='" + sql_safe(table_name) + "'";
   vector<text_tmap> sql_results;
   if (!sqlgetarray(sql_cmd, sql_results) || sql_results.size() == 0)