Changeset 1835

Timestamp:

2001-01-15T12:51:24+13:00 (23 years ago)

Author:

kjm18

Message:

BrowseFields filteroption renamed IndexField - uses indexfieldmap in build.cfg
Level info also set in collect.cfg.
termvariants now present.

Location:

trunk/gsdl/src/colservr

Files:

• mgppqueryfilter.cpp (modified) (6 diffs)
• mgppqueryfilter.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -38 +38 @@
 mgppqueryfilterclass::mgppqueryfilterclass () 
   : queryfilterclass() {
-  
- FilterOption_t filtopt;
+
+  
+  FilterOption_t filtopt;
+  
   // -- onePerTerm  Level          enumerated
+  // Document, Section, Paragraph
   filtopt.clear();
   filtopt.name = "Level";
@@ -46 +49 @@
   filtopt.repeatable = FilterOption_t::onePerTerm;
   filtopt.validValues.push_back("Document");
-  filtopt.validValues.push_back("Section");
-  filtopt.validValues.push_back("Paragraph");
   filtopt.defaultValue = "Document";
   filterOptions["Level"] = filtopt;
 
-  // --  BrowseFields, enumerated, used to list available fields
+  // --  IndexField, enumerated, used to list available fields
+  // ZZ used to represent "AllFields"
   filtopt.clear();
-  filtopt.name = "BrowseFields";
+  filtopt.name = "IndexField";
   filtopt.type = FilterOption_t::enumeratedt;
   filtopt.repeatable = FilterOption_t::onePerTerm;
-  filtopt.validValues.push_back("AllFields");
-  filtopt.defaultValue = "AllFields";
-  filterOptions["BrowseFields"] = filtopt;
+  filtopt.validValues.push_back("ZZ");
+  filtopt.defaultValue = "ZZ";
+  filterOptions["IndexField"] = filtopt;
 
 }
@@ -74 +76 @@
   queryfilterclass::configure(key, cfgline);
 
-  if (key == "indexfields") {
+  if (key == "indexfieldmap") {
+    indexfieldmap.importmap (cfgline);
+    
+    // update the list of indexes in the filter information
+    text_tarray options;
+    indexfieldmap.gettoarray (options);
+
+    text_tarray::const_iterator here = options.begin();
+    text_tarray::const_iterator end = options.end();
+    
+    while (here !=end) {
+      if (!(*here).empty())
+    filterOptions["IndexField"].validValues.push_back(*here);
+      here++;
+    }
+  }
+
+  if (key == "levels") {
     text_tarray::const_iterator here = cfgline.begin();
     text_tarray::const_iterator end = cfgline.end();
-    
-    while (here !=end) {
-      
-      filterOptions["BrowseFields"].validValues.push_back(*here);
+
+    while (here != end) {
+      if (!(*here).empty())
+    filterOptions["Level"].validValues.push_back(*here);
       here++;
     }
@@ -185 +204 @@
   // assemble the term results
   if (need_term_info(request.filterResultOptions)) {
-    // note: the terms have already been sorted and uniqued
+    // note: the terms have already been sorted and uniqued - ?? have they??
 
     TermInfo_t terminfo;
@@ -199 +218 @@
 
       // this bit gets the matchTerms ie the equivalent (stem/casefold) terms
-      // there is no info in termvariants at this stage - need to modify mgpp 
-      // to get this info
-      /* 
       if (terms_first) {
     text_tset::iterator termvariants_here = queryresults.termvariants.begin();
@@ -211 +227 @@
       }
       terms_first = false;
-      */
-      // for now, just put the original terms in
-      terminfo.matchTerms.push_back(terminfo.term);
-
+      
       response.termInfo.push_back (terminfo);
 

trunk/gsdl/src/colservr/mgppqueryfilter.h

@@ -35 +35 @@
 protected:
 
+  stringmap indexfieldmap;
   bool full_text_browse (int filterRequestOptions);