Changeset 2612

Timestamp:

2001-06-27T17:40:11+12:00 (23 years ago)

Author:

dmm9

Message:

adding filter for nonexistent metadata

Location:

trunk/gsdl/src/recpt

Files:

• browseaction.cpp (modified) (2 diffs)
• browseactiontools.cpp (modified) (2 diffs)
• browseactiontools.h (modified) (1 diff)

trunk/gsdl/src/recpt/browseaction.cpp

@@ -212 +212 @@
     }// if (err != noError) 
 
-  }// if(!args["bft"].empty())
+  }// end if(!args["bft"].empty())
   else {
     text_tset metadata_items;
@@ -221 +221 @@
              response,logout)) return false;
   }
-  
+
+  //get rid of documents that do not have the metadata element classified on
+  if(!remove_no_meta_results("Title",response, outconvert)) {
+    return false;
+    logout<<"ERROR: browseactiontools::remove_no_meta_results failed"<<endl;
+  }
+
   textout << outconvert << disp << "_browse:header_\n" <<"_browse:content_";
 

trunk/gsdl/src/recpt/browseactiontools.cpp

@@ -56 +56 @@
 }
 
+// this stuff is all copied from the queryoptions code - don't ask how it all
+// hangs in with the filters - those things are a mystery 
 void set_browsefilter_options(FilterRequest_t &request, text_t &browsestring,
                   cgiargsclass &args)
@@ -94 +96 @@
 }
 
+bool remove_no_meta_results(text_t metaname, FilterResponse_t &response, 
+                outconvertclass outconvert)
+{
+  ResultDocInfo_tarray::iterator check = response.docInfo.begin();
+  ResultDocInfo_tarray::iterator done = response.docInfo.end();
+
+  // look through all the returned documents
+  while(check != done){
+    //if the document doesn't have the metadata item classified on 
+    //remove it.
+    if(*((*check).metadata.find(metaname)->second).values.begin()=="")
+      {
+    check = response.docInfo.erase(check);
+      }
+    else {
+       check ++;
+    }
+   
+  }
+  return true;
+}
+
+
+
+
+

trunk/gsdl/src/recpt/browseactiontools.h

@@ -34 +34 @@
 void format_browsestring(text_t orig, text_t& formatted, int and_or);
 
+//this thing sets up the search associated with a browse.  It's programmed by 
+//witchcraft, so I don't really know how/why it works - I lifted the code from
+//somewhere else.
 void set_browsefilter_options(FilterRequest_t &request, text_t &browsestring,
                   cgiargsclass &args);
 
-void format_browsestring(text_t orig, text_t& formatted, int and_or);
+//this thing filters out all the results of a request to the collection 
+//(whether it be for all documents or just the ones with specified terms)
+//that don't have the required "metaname" metadata element.
+bool remove_no_meta_results(text_t metaname, FilterResponse_t &response,
+                outconvertclass outconvert);
 
 #endif