Changeset 2464

Timestamp:

2001-05-23T15:08:42+12:00 (23 years ago)

Author:

dmm9

Message:

got filter terms working (sort of)

File:

• trunk/gsdl/src/recpt/browseaction.cpp (modified) (4 diffs)

trunk/gsdl/src/recpt/browseaction.cpp

@@ -98 +98 @@
 
 bool browseaction::init (ostream &logout){
-  cerr<<"init"<<endl;
   return true;
 }
@@ -131 +130 @@
                        recptprotolistclass *protos, 
                        ostream &logout){
-  //cerr<<"define_internal_macros"<<endl;
+ 
 }
 
@@ -142 +141 @@
 
 bool browseaction::do_action (cgiargsclass &args, recptprotolistclass *protos, 
-        browsermapclass *browsers, displayclass &disp, 
-        outconvertclass &outconvert, ostream &textout, 
-        ostream &logout){
-  
-  
-  textout << outconvert << disp << "_browse:header_\n" <<"_browse:content_"
-      << "_browse:footer_";
+                  browsermapclass *browsers, displayclass &disp, 
+                  outconvertclass &outconvert, ostream &textout, 
+                  ostream &logout){
+ 
   if(args["c"].empty()) return false;
   else if(get_document_list(args, protos, browsers, disp, outconvert, textout,
@@ -201 +197 @@
     text_t bf_string = "";
     format_browsestring(args["bft"],bf_string,args.getintarg("bt"));
-  }
-
-  //check that there is a querystring
-  //if(!newqstring.empty()){
     
+    set_browsefilter_options(request, bf_string, args);
+
+    colproto->filter (collection, request, response, err, logout);
+    if (err != noError) {
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii
+         << "browseaction::get_document_list QueryFilter failed "
+         << "for " << collection << " collection (" 
+         << get_comerror_string (err) << ")\n";
+      return false;
+    }// if (err != noError) 
+
+  }// if(!args["bft"].empty())
+
+  textout << outconvert << disp << "_browse:header_\n" <<"_browse:content_";
+
+  
+  bool use_table = is_table_content (formatptr);
+  br_ptr->output_section_group (response, args, collection, 0, formatptr, 
+                  use_table, request.fields, request.getParents, 
+                  colproto, disp, outconvert, textout, logout);
+
+  textout << outconvert << disp << "_browse:footer_";
+