Changeset 963 for trunk/gsdl/src/recpt/historydb.cpp

Timestamp:

2000-02-22T11:01:02+13:00 (24 years ago)

Author:

sjboddie

Message:

gsdlhome now comes from gsdlsite.cfg

File:

• trunk/gsdl/src/recpt/historydb.cpp (modified) (8 diffs)

trunk/gsdl/src/recpt/historydb.cpp

@@ -28 +28 @@
 /*
   $Log$
+  Revision 1.3  2000/02/21 22:01:02  sjboddie
+  gsdlhome now comes from gsdlsite.cfg
+
   Revision 1.2  2000/02/17 02:40:21  sjboddie
   tidied up a bit - fixed a bug (gdbm file wasn't always being closed properly)
@@ -35 +38 @@
 
 #include "historydb.h"
-#include "gsdlhome.h"
 #include "fileutil.h"
 #include "cgiutils.h"
@@ -44 +46 @@
 // returns true on success (in which case historyinfo will contain
 // the information for this history)
-bool get_history_info (const text_t &userid, text_tarray &historyinfo, ostream &logout) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool get_history_info (const text_t &userid, text_tarray &historyinfo, 
+               const text_t &gsdlhome, ostream &logout) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   bool result = false;
@@ -74 +77 @@
 
 // returns true on success
-bool set_history_info (const text_t &userid, const text_t &history) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool set_history_info (const text_t &userid, const text_t &history, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   bool result = false;
@@ -126 +129 @@
 
 // deletes all a users history
-bool delete_all_history_info (const text_t &userid) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool delete_all_history_info (const text_t &userid, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   
   // open the history database  
@@ -142 +145 @@
 
 //deletes only the selected records
-bool delete_history_info(const text_t &userid, const text_t &deletemode, const text_t &selection) {
-
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+bool delete_history_info (const text_t &userid, const text_t &deletemode, 
+              const text_t &selection, const text_t &gsdlhome) {
+
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   bool result;
   // open the history database  
@@ -305 +309 @@
 // replaces a reference to a previous query with the search
 // string from that query
-bool combine_query(text_t &userid, text_t &query) 
+bool combine_query(text_t &userid, text_t &query, const text_t &gsdlhome) 
 {
   text_t::iterator begin = query.begin();
@@ -314 +318 @@
  
   text_t queryresult = "";
-  text_t historyfile = filename_cat(GSDL_GSDLHOME, "etc", "history.db");
+  text_t historyfile = filename_cat(gsdlhome, "etc", "history.db");
   text_t historyresult;
   // open the history database