Changeset 10954 for trunk/gsdl

Timestamp:

2005-11-28T16:53:56+13:00 (18 years ago)

Author:

kjdon

Message:

made the indexfieldmap use defaultindex for mgppqueryfilter so that can set the default field for plain search

Location:

trunk/gsdl/src/colservr

Files:

• mgppqueryfilter.cpp (modified) (2 diffs)
• mgppqueryfilter.h (modified) (1 diff)
• queryfilter.h (modified) (1 diff)

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -78 +78 @@
     text_tarray options;
     indexfieldmap.gettoarray (options);
-    filterOptions["IndexField"].validValues.erase(filterOptions["IndexField"].validValues.begin(), filterOptions["IndexField"].validValues.end());
-    text_tarray::const_iterator here = options.begin();
-    text_tarray::const_iterator end = options.end();
-    bool start = true;
-    while (here !=end) {
-      if (!(*here).empty()) {
-    filterOptions["IndexField"].validValues.push_back(*here);
-    if (start) {
-      filterOptions["IndexField"].defaultValue = *here;
-      start = false;
-    }
-      }
-      ++here;
-    }
+    filterOptions["IndexField"].validValues = options;
     
   } else if (key == "indexlevels") {
@@ -113 +100 @@
   } else if (key == "indexstem") {
     ((mgppsearchclass *)textsearchptr)->set_indexstem (cfgline[0]);
-  }
-  
-}
-
+  } else if (key == "defaultindex") { // used for fields in mgpp
+    indexfieldmap.from2to (cfgline[0], filterOptions["IndexField"].defaultValue);
+  }
+  
+}
+
+bool mgppqueryfilterclass::init (ostream &logout) {
+  
+  if (!queryfilterclass::init(logout)) {
+    return false;
+  }
+  
+  if (filterOptions["IndexField"].defaultValue.empty()) {
+    // use first index in map as default if no default is set explicitly
+    text_tarray fromarray;
+    indexfieldmap.getfromarray(fromarray);
+    if (fromarray.size()) {
+      filterOptions["IndexField"].defaultValue = fromarray[0];
+    }
+  }
+  return true;
+}
 
 void mgppqueryfilterclass::filter(const FilterRequest_t &request,

trunk/gsdl/src/colservr/mgppqueryfilter.h

@@ -50 +50 @@
 
   void configure (const text_t &key, const text_tarray &cfgline);
-
+  bool init (ostream &logout);
   void filter (const FilterRequest_t &request,
                FilterResponse_t &response,

trunk/gsdl/src/colservr/queryfilter.h

@@ -78 +78 @@
 
   virtual void configure (const text_t &key, const text_tarray &cfgline);
-  bool init (ostream &logout);
+  virtual bool init (ostream &logout);
 
   text_t get_filter_name () {return "QueryFilter";}