Changeset 22050 for main/trunk/greenstone2/runtime-src/src/colservr/sqlbrowsefilter.cpp

Timestamp:

2010-05-06T12:58:19+12:00 (14 years ago)

Author:

davidb

Message:

Updating of code to support sql-query filter

File:

• main/trunk/greenstone2/runtime-src/src/colservr/sqlbrowsefilter.cpp (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/sqlbrowsefilter.cpp

@@ -3 +3 @@
  * sqlbrowsefilter.cpp -- 
  * Copyright (C) 2008  DL Consulting Ltd
+ * Copyright (C) 2010  New Zealand Digital Library Project
  *
  * A component of the Greenstone digital library software
@@ -25 +26 @@
 
 #include "sqlbrowsefilter.h"
-#include "fileutil.h"
-
 
 sqlbrowsefilterclass::sqlbrowsefilterclass ()
-{
-  sql_db_ptr = NULL;
-}
+  : sqlfilterclass()
+{}
 
 
 sqlbrowsefilterclass::~sqlbrowsefilterclass ()
-{
-}
-
-
-void sqlbrowsefilterclass::configure (const text_t &key, const text_tarray &cfgline)
-{
-  filterclass::configure (key, cfgline);
-
-  if (key == "indexstem")
-  {
-    indexstem = cfgline[0];
-  }
-}
-
-
-bool sqlbrowsefilterclass::init (ostream &logout)
-{
-  outconvertclass text_t2ascii;
-
-  if (!filterclass::init(logout)) return false;
-
-  if (sql_db_ptr == NULL)
-  {
-    // most likely a configuration problem
-    logout << text_t2ascii << "configuration error: sqlbrowsefilter contains a null sqldbclass\n\n";
-    return false;
-  }
-
-  if (indexstem.empty())
-  {
-    indexstem = collection;
-  }
-
-  // get the filename for the database and make sure it exists
-  sql_db_filename = resolve_db_filename(indexstem,sql_db_ptr->getfileextension());
-  if (!file_exists(sql_db_filename))
-  {
-    logout << text_t2ascii << "warning: database \"" << sql_db_filename << "\" does not exist\n\n";
-    return false;
-  }
-
-  return true;
-}
-
+{}
 
 void sqlbrowsefilterclass::filter (const FilterRequest_t &request,
@@ -86 +41 @@
   outconvertclass text_t2ascii;
 
-  response.clear();
-  err = noError;
-
-  if (sql_db_ptr == NULL) {
-    // most likely a configuration problem
-    logout << text_t2ascii << "configuration error: sqlbrowsefilter contains a null sqldbclass\n\n";
-    err = configurationError;
-    return;
-  }
-
-  // open the database
-  sql_db_ptr->setlogout (&logout);
-  if (!sql_db_ptr->opendatabase (sql_db_filename, DB_READER, 100, false)) {
-    // most likely a system problem (we have already checked that the database exists)
-    logout << text_t2ascii << "system problem: open on database \"" << sql_db_filename << "\" failed\n\n";
-    err = systemProblem;
+  if (!connect_to_sqldb(response,err,logout)) {
     return;
   }
@@ -201 +141 @@
   }
 
-  sql_db_ptr->closedatabase();  // Important that local library doesn't leave any files open
+  disconnect_from_sqldb();
+
 }