Changeset 4808

Timestamp:

2003-06-25T15:37:48+12:00 (21 years ago)

Author:

kjdon

Message:

the level filteroption is now initialized from indexlevels and textlevel from build.cfg, not using levels from collect.cfg. this means it will not work with old colls. but it no longer assumes anything about what levels are available

File:

• trunk/gsdl/src/colservr/mgppqueryfilter.cpp (modified) (2 diffs)

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -43 +43 @@
   
   // -- onePerTerm  Level          enumerated
-  // Document, Section, Paragraph
+  // likely to be Doc, Sec, Para, but we dont assume anything now
   filtopt.clear();
   filtopt.name = "Level";
   filtopt.type = FilterOption_t::enumeratedt;
   filtopt.repeatable = FilterOption_t::onePerTerm;
-  filtopt.validValues.push_back("Document");
-  filtopt.defaultValue = "Document";
   filterOptions["Level"] = filtopt;
 
@@ -94 +92 @@
       here++;
     }
-  }
-
-  if (key == "levels") {
-    // if levels has been specified, we remove the default Document from valid values - currently, it is the only one - not yet
-    //filterOptions["Level"].validValues.erase(0);
+  } 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 ((*here) == "section" || (*here) == "Section") {
-      filterOptions["Level"].validValues.push_back("Section");
-      filterOptions["Level"].defaultValue = "Section";
-      text_t sect = "Section";
-      ((mgppsearchclass *)mgsearchptr)->set_gdbm_level(sect);
-    } else if ((*here) == "document" || (*here) == "Document") {
-      //filterOptions["Level"].validValues.push_back("Document");
-    } else if ((*here) == "paragraph" || (*here) == "Paragraph") {
-      filterOptions["Level"].validValues.push_back("Paragraph");
-    }
-      }
-      here++;
-    }
-    // just check to make sure that there have been some levels specified
-    // if (filterOptions["Level"].validValues.empty()) {
-      // add back in document
-    // filterOptions["Level"].validValues.push_back("Document");
-    // }
-    
-  }
+    if (first) {
+      first = false;
+      // the default is the first value
+      filterOptions["Level"].defaultValue = *here;
+    }
+    filterOptions["Level"].validValues.push_back(*here);
+      }
+      here ++;
+    }
+  } else if (key == "textlevel") {
+      ((mgppsearchclass *)mgsearchptr)->set_gdbm_level( cfgline[0]);
+  }
+  
 }