Changeset 4752

Timestamp:

2003-06-23T14:09:43+12:00 (21 years ago)

Author:

kjdon

Message:

changed the level configure stuff a bit

File:

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

trunk/gsdl/src/colservr/mgppqueryfilter.cpp

@@ -53 +53 @@
 
   // --  IndexField, enumerated, used to list available fields
-  // ZZ used to represent "AllFields"
   filtopt.clear();
   filtopt.name = "IndexField";
   filtopt.type = FilterOption_t::enumeratedt;
   filtopt.repeatable = FilterOption_t::onePerTerm;
-  filtopt.validValues.push_back("ZZ");
-  filtopt.defaultValue = "ZZ";
+  filtopt.defaultValue = "";
   filterOptions["IndexField"] = filtopt;
 
@@ -85 +83 @@
     text_tarray::const_iterator here = options.begin();
     text_tarray::const_iterator end = options.end();
-    
+    bool start = true;
     while (here !=end) {
-      if (!(*here).empty())
+      if (!(*here).empty()) {
     filterOptions["IndexField"].validValues.push_back(*here);
+    if (start) {
+      filterOptions["IndexField"].defaultValue = *here;
+      start = false;
+    }
+      }
       here++;
     }
@@ -94 +97 @@
 
   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);
     text_tarray::const_iterator here = cfgline.begin();
     text_tarray::const_iterator end = cfgline.end();
-
+    
     while (here != end) {
       if (!(*here).empty()) {
-    filterOptions["Level"].validValues.push_back(*here);
-    if ((*here) == "Section") {
+    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");
+    // }
     
   }