Changeset 226 for trunk/gsdl/src/recpt/comtypes.cpp

Timestamp:

1999-04-07T10:20:35+12:00 (25 years ago)

Author:

rjmcnab

Message:

Got browsefilter working.

File:

• trunk/gsdl/src/recpt/comtypes.cpp (modified) (3 diffs)

trunk/gsdl/src/recpt/comtypes.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.6  1999/04/06 22:20:34  rjmcnab
+   Got browsefilter working.
+
    Revision 1.5  1999/03/31 23:44:47  rjmcnab
    Altered the protocol so that the metadata is part of the filter.
@@ -39 +42 @@
   else if (err == authenticationFailure) return "authentication failure";
   else if (err == protocolError) return "protocol error";
+  else if (err == configurationError) return "configuration error";
   else if (err == systemProblem) return "system problem";
 
@@ -94 +98 @@
 
 void FilterOption_t::check_defaultValue () {
-  if (validValues.empty()) {
-    // nothing to check against
-    defaultValue.clear();
-    return;
+  text_tarray::iterator here, end;
+
+  // how the default is interpreted depends on the option type
+  switch (type) {
+  case booleant: 
+  case enumeratedt: // has to be one of the validValues
+    here = validValues.begin ();
+    end = validValues.end ();
+    while (here != end) {
+      if (*here == defaultValue) return;
+      here++;
+    }
+    
+    break;
+
+  case integert: // has to be in the validValues range
+    if ((validValues.size() >= 2) &&
+    (validValues[0].getint() <= defaultValue.getint()) &&
+    (validValues[1].getint() >= defaultValue.getint()))
+      return;
+    break;
+
+  case stringt: // any value is valid
+    return; 
   }
 
-  text_tarray::iterator here = validValues.begin ();
-  text_tarray::iterator end = validValues.end ();
-  while (here != end) {
-    if (*here == defaultValue) {
-      // found the default value in the list of valid values
-      // now there is nothing more to do
-      return;
-    }
-
-    here++;
-  }
-
-  // did not find the defaultValue, set it to be the
-  // first option in the list
-  defaultValue = validValues[0];
+  // did not find the defaultValue
+  if (validValues.empty()) defaultValue.clear();
+  else defaultValue = validValues[0];
 }