Changeset 20727

Timestamp:

2009-09-28T14:59:17+13:00 (15 years ago)

Author:

kjdon

Message:

added support for defaultlevel in collect.cfg, for mgpp and lucene. also added defaultindex for lucene

Location:

gsdl/trunk/runtime-src/src/colservr

Files:

• lucenequeryfilter.cpp (modified) (3 diffs)
• lucenequeryfilter.h (modified) (2 diffs)
• mgppqueryfilter.cpp (modified) (4 diffs)
• mgppqueryfilter.h (modified) (1 diff)

gsdl/trunk/runtime-src/src/colservr/lucenequeryfilter.cpp

@@ -45 +45 @@
   filtopt.type = FilterOption_t::enumeratedt;
   filtopt.repeatable = FilterOption_t::onePerTerm;
+  filtopt.defaultValue = "";
   filterOptions["Level"] = filtopt;
 
@@ -75 +76 @@
     text_tarray options;
     indexfieldmap.gettoarray (options);
-
-    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 == "levelmap") {
+    levelmap.importmap (cfgline);
   } else if (key == "indexlevels") {
     text_tarray::const_iterator here = cfgline.begin();
     text_tarray::const_iterator end = cfgline.end();
-    bool first=true;
     while (here != end) {
       if (!(*here).empty()) {
-    if (first) {
-      first = false;
-      // the default is the first value
-      filterOptions["Level"].defaultValue = *here;
-    }
     filterOptions["Level"].validValues.push_back(*here);
       }
@@ -106 +90 @@
   } else if (key == "textlevel") {
       ((lucenesearchclass *)textsearchptr)->set_text_level(cfgline[0]);
-  }
-  
-}
-
+  } else if (key == "defaultindex") { 
+    indexfieldmap.from2to (cfgline[0], filterOptions["IndexField"].defaultValue);
+  } else if (key == "defaultlevel") { 
+    levelmap.from2to (cfgline[0], filterOptions["Level"].defaultValue);
+  }
+  
+}
+
+bool lucenequeryfilterclass::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];
+    }
+  }
+  if (filterOptions["Levels"].defaultValue.empty()) {
+    // use first level as default if no default is set explicitly
+    if (!filterOptions["Level"].validValues[0].empty())
+      filterOptions["Levels"].defaultValue = filterOptions["Level"].validValues[0];
+  }
+
+  return true;
+}
 
 void lucenequeryfilterclass::filter(const FilterRequest_t &request,

gsdl/trunk/runtime-src/src/colservr/lucenequeryfilter.h

@@ -36 +36 @@
 
   stringmap indexfieldmap;
+  stringmap levelmap;
+
   bool full_text_browse (int filterRequestOptions);
 
@@ -50 +52 @@
 
   void configure (const text_t &key, const text_tarray &cfgline);
-
+  bool init (ostream &logout);
   void filter (const FilterRequest_t &request,
                FilterResponse_t &response,

gsdl/trunk/runtime-src/src/colservr/mgppqueryfilter.cpp

@@ -45 +45 @@
   filtopt.type = FilterOption_t::enumeratedt;
   filtopt.repeatable = FilterOption_t::onePerTerm;
+  filtopt.defaultValue = "";
   filterOptions["Level"] = filtopt;
 
@@ -71 +72 @@
   if (key == "indexfieldmap") {
     indexfieldmap.importmap (cfgline);
-    
-    // update the list of indexes in the filter information
     text_tarray options;
     indexfieldmap.gettoarray (options);
     filterOptions["IndexField"].validValues = options;
     
+  } else if (key == "levelmap") {
+    levelmap.importmap (cfgline);
   } else if (key == "indexlevels") {
+    filterOptions["Level"].validValues.erase(filterOptions["Level"].validValues.begin(), filterOptions["Level"].validValues.end());
     text_tarray::const_iterator here = cfgline.begin();
     text_tarray::const_iterator end = cfgline.end();
-    bool first=true;
-    filterOptions["Level"].validValues.erase(filterOptions["Level"].validValues.begin(), filterOptions["Level"].validValues.end());
     while (here != end) {
       if (!(*here).empty()) {
-    if (first) {
-      first = false;
-      // the default is the first value
-      filterOptions["Level"].defaultValue = *here;
-    }
     filterOptions["Level"].validValues.push_back(*here);
       }
@@ -99 +94 @@
   } else if (key == "defaultindex") { // used for fields in mgpp
     indexfieldmap.from2to (cfgline[0], filterOptions["IndexField"].defaultValue);
+  } else if (key == "defaultlevel") { 
+    levelmap.from2to (cfgline[0], filterOptions["Level"].defaultValue);
   }
   
@@ -117 +114 @@
     }
   }
+  if (filterOptions["Levels"].defaultValue.empty()) {
+    // use first level as default if no default is set explicitly
+    if (!filterOptions["Level"].validValues[0].empty())
+      filterOptions["Levels"].defaultValue = filterOptions["Level"].validValues[0];
+  }
+
   return true;
 }

gsdl/trunk/runtime-src/src/colservr/mgppqueryfilter.h

@@ -36 +36 @@
 
   stringmap indexfieldmap;
+  stringmap levelmap;
+
   bool full_text_browse (int filterRequestOptions);