Changeset 27172 for main/trunk/greenstone2/runtime-src/src/recpt/queryaction.h

Timestamp:

2013-04-11T12:43:36+12:00 (11 years ago)

Author:

kjdon

Message:

For diego: when doing cross collection searching, now it takes into account authentication directives for the collections in the list. If a user has authenticated to get into the top collection, then his user groups are checked against the groups for all the collections. If he matches any, then they will be searched. But if he is not a member of the right group they will not be searched. If there was no authentication needed to get into top colleciton, then any collections with collection-level authentication will not be searched.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/queryaction.h (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/recpt/queryaction.h

@@ -30 +30 @@
 #include "gsdlconf.h"
 #include "basequeryaction.h"
+#include "userdb.h"
 #include "receptionist.h"
 
@@ -41 +42 @@
   int num_phrases;
 
+  userdbclass *user_database; // for checking user groups in ccs
   virtual text_t query_filter_name () {return "QueryFilter";}
 
@@ -91 +93 @@
   virtual bool save_search_history(cgiargsclass &args, int numdocs, 
                    isapprox isApprox);
-
+  bool user_groups_match(const text_t &collection_groups, const text_t &user_groups);
+  void validate_ccs_collection_list(cgiargsclass &args, recptprotolistclass *protos, ostream &logout);
 public:
   queryaction ();
@@ -99 +102 @@
   bool init (ostream &logout);
   
+  void set_userdb(userdbclass *udb) {user_database = udb;}
   virtual text_t get_action_name () {return "q";}
   
   virtual bool check_cgiargs (cgiargsinfoclass &argsinfo, cgiargsclass &args, 
                   recptprotolistclass *protos, ostream &logout);
-
   virtual void define_internal_macros (displayclass &disp, cgiargsclass &args, 
                    recptprotolistclass *protos, ostream &logout);