Changeset 5906

Timestamp:

2003-11-19T16:47:47+13:00 (20 years ago)

Author:

sjboddie

Message:

Fixed a bug in some very old collection server code. There was a problem
preventing the docSet stuff from working when passed to mgqueryfilter.
I guess nobody's ever used this stuff!

File:

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

trunk/gsdl/src/colservr/filter.cpp

@@ -263 +263 @@
 bool in_set (const text_tset &set1, const text_t &el) {
   text_t::const_iterator here = el.begin();
-  text_t::const_iterator end = el.begin();
+  text_t::const_iterator end = el.end();
   text_t tryel, tryel_add;
   bool first = true;
@@ -285 +285 @@
 bool in_set (const text_tarray &set1, const text_t &el) {
   text_t::const_iterator here = el.begin();
-  text_t::const_iterator end = el.begin();
+  text_t::const_iterator end = el.end();
   text_t tryel, tryel_add;
   bool first = true;
@@ -299 +299 @@
 
     // see if this element is in the set
-    text_tarray::const_iterator here = set1.begin();
-    text_tarray::const_iterator end = set1.end();
-    while (here != end) {
-      if (*here == tryel) break;
-      here ++;
+    text_tarray::const_iterator h = set1.begin();
+    text_tarray::const_iterator e = set1.end();
+    while (h != e) {
+      if (*h == tryel) return true;
+      h++;
     }
-    if (here != end) return true;
   } while (here != end);