Changeset 22043 for main/trunk/greenstone2/common-src/src/lib/mssqldbclass.h

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/mssqldbclass.h (modified) (3 diffs)

main/trunk/greenstone2/common-src/src/lib/mssqldbclass.h

@@ -3 +3 @@
  * mssqldbclass.h -- 
  * Copyright (C) 2008  DL Consulting Ltd
+ * Copyright (C) 2010  New Zealand Digital Library Project
  *
  * A component of the Greenstone digital library software
@@ -35 +36 @@
 class mssqldbclass : public sqldbclass
 {
- private:
-
-  _ConnectionPtr dbptr;
-
-  text_t tableid;
-  
-  // To enable the debug string to be output to cerr.
-  bool debug;
-  
-  text_tmap read_infodb_file (text_t filename);
-
-  void debug_output (text_t output_string);
-
-  text_t convert_bstr_to_textt (_variant_t in);
-
-  bool dbquery (const text_t &sql);
-
-  bool sqlgetarray (const text_t &sql_cmd, vector<text_tmap> &sql_results);
-
-  text_t mssql_safe (const text_t &value_arg);
-  
  public:
 
   mssqldbclass ();
-
-  ~mssqldbclass ();
+  virtual ~mssqldbclass ();
   
   // returns true if opened
@@ -81 +60 @@
   
   // returns array of document OIDs
-  text_tarray get_documents_with_metadata_value (const text_tarray &metadata_element_names,
-                                                 const text_t &metadata_value,
-                                                 const text_t &sort_by_metadata_element_name);
+  virutal text_tarray get_documents_with_metadata_value (const text_tarray &metadata_element_names,
+                             const text_t &metadata_value,
+                             const text_t &sort_by_metadata_element_name);
   
   // returns array of values
-  text_tarray get_metadata_values (const text_tarray &metadata_element_names,
-                                   const text_t &metadata_value_filter,
-                                   const text_t &metadata_value_grouping_expression);
+  virtual text_tarray get_metadata_values (const text_tarray &metadata_element_names,
+                       const text_t &metadata_value_filter,
+                       const text_t &metadata_value_grouping_expression);
+
+
+ protected:
+  _ConnectionPtr dbptr;
+  text_t tableid;
+  bool debug; // To enable the debug string to be output to cerr.
+
+  virutal text_t sql_safe (const text_t &value_arg);
+
+  virtual bool sqlexec (const text_t &sql);
+  virtual bool sqlgetarray (const text_t &sql_cmd, vector<text_tmap> &sql_results);
+  virtual bool sqltableexists (const text_t &table_name);
+
+  
+  text_tmap read_infodb_file (text_t filename);
+  void debug_output (text_t output_string);
+  text_t convert_bstr_to_textt (_variant_t in);
+
 };