Changeset 2459

Timestamp:

2001-05-22T17:06:59+12:00 (23 years ago)

Author:

dmm9

Message:

got formatting of browse filter string working

Location:

trunk/gsdl/src/recpt

Files:

• browseaction.cpp (modified) (3 diffs)
• browseactiontools.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/browseaction.cpp

@@ -30 +30 @@
 browseaction::browseaction(){
 
-  cerr<<"initialising browseaction"<<endl;
+  //cerr<<"initialising browseaction"<<endl;
 
   cgiarginfo arg_ainfo;
@@ -92 +92 @@
   argsinfo.addarginfo (NULL, arg_ainfo);
   
-  cerr<<"constructor"<<endl;
+  //cerr<<"constructor"<<endl;
 }
 
@@ -197 +197 @@
   request.filterResultOptions = FROID | FRmetadata;
   
-  //set up querystring;
-  text_t newqstring = "";
-  format_qstring(args["bft"],newqstring,args.getintarg("bt"));
-  
+  //set up browse filter string;
+  if(!args["bft"].empty()){
+    text_t bf_string = "";
+    format_browsestring(args["bft"],bf_string,args.getintarg("bt"));
+    cout<<"F: "<<bf_string.getcstr()<<endl;
+  }
+
   //check that there is a querystring
   //if(!newqstring.empty()){

trunk/gsdl/src/recpt/browseactiontools.cpp

@@ -26 +26 @@
 
 #include "browseactiontools.h"
+#include <ctype.h>
 
-void format_qstring(text_t orig, text_t& formatted, int and_or)
+void format_browsestring(text_t orig, text_t& formatted, int and_or)
 {
+  
+ 
+  text_t conj = "";
+  
+  if(and_or == 0){ conj = " | "; }
+  else { conj = " & "; }
+  text_t::const_iterator here = orig.begin();
+  text_t::const_iterator end = orig.end();
+  
+  //while not at the end of the filter string
+  while(here!=end){
+    //if seeing text, add it to the formatted string
+    if(!isspace(*here)){
+      formatted.push_back(*here);
+      here++;
+    }
+    //else, if seeing spaces, check that there is following text and add
+    //the ncessary conjugation if there is.
+    else if(isspace(*here)){
+      while(isspace(*here) && here!=end) here++;
+      if(here!=end) formatted += conj;
+    }
+  }
 
 }
 
-void set_browsefilter_options(FilterRequest_t &request, text_t &querystring,
+void set_browsefilter_options(FilterRequest_t &request, text_t &browsestring,
                   cgiargsclass &args)
 {