Changeset 472 for trunk/gsdl/src/colservr/filter.cpp

Timestamp:

1999-08-25T16:50:00+12:00 (25 years ago)

Author:

sjboddie

Message:

changed FilterRequest_t::docSet into an array

File:

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

trunk/gsdl/src/colservr/filter.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.7  1999/08/25 04:49:33  sjboddie
+   changed FilterRequest_t::docSet into an array
+
    Revision 1.6  1999/07/16 03:42:23  sjboddie
    changed isApprox
@@ -111 +114 @@
       (request.filterResultOptions & FRmetadata)) {
     // copy the OIDs from the request to the response
-    text_tset::const_iterator here = request.docSet.begin();
-    text_tset::const_iterator end = request.docSet.end();
+    text_tarray::const_iterator here = request.docSet.begin();
+    text_tarray::const_iterator end = request.docSet.end();
     while (here != end) {
       resultdoc.OID = (*here);
@@ -244 +247 @@
 }
 
+void intersect (text_tarray &set1, const text_tarray &set2) {
+  text_tarray resultset;
+
+  text_tarray::const_iterator set1_here = set1.begin();
+  text_tarray::const_iterator set1_end = set1.end();
+
+  while (set1_here != set1_end) {
+    if (in_set (set2, *set1_here))
+      resultset.push_back (*set1_here);
+    set1_here ++;
+  }
+  set1 = resultset;
+}
 
 // tests to see if el is in set
@@ -267 +283 @@
   return false;
 }
+
+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 tryel, tryel_add;
+  bool first = true;
+
+  // the element is in the set if any of its parents are
+  // in the set
+  do {
+    // get next possible element to try
+    here = getdelimitstr (here, end, '.', tryel_add);
+    if (!first) tryel += ".";
+    first = false;
+    tryel += tryel_add;
+
+    // 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 ++;
+    }
+    if (here != end) return true;
+  } while (here != end);
+
+  return false;
+}