Changeset 829 for trunk

Timestamp:

1999-12-13T15:55:49+13:00 (24 years ago)

Author:

davidb

Message:

Support for docs/sections with more than one metavalue for a metadata name

File:

• trunk/gsdl/src/colservr/browsefilter.cpp (modified) (5 diffs)

trunk/gsdl/src/colservr/browsefilter.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.9  1999/12/13 02:55:49  davidb
+   Support for docs/sections with more than one metavalue for a metadata name
+
    Revision 1.8  1999/10/19 03:23:39  davidb
    Collection building support through web pages
@@ -206 +209 @@
       // insert the last result in the set
       if (!tmptext.empty()) resultset.push_back (tmptext);
-      
-      // do an intersection with the input set
-      if (!request.docSet.empty()) {
-    intersect (resultset, request.docSet);
-      }
+
+      text_tarray offset_resultset;
+      text_t &md_type = info["mdtype"];
+      if (!md_type.empty())
+    {
+      text_t &md_offset = info["mdoffset"];
+      if (!md_offset.empty())
+        {
+          text_t offsettext;
+
+          text_t::iterator offset_here = md_offset.begin();
+          text_t::iterator offset_end = md_offset.end();
+          while (offset_here != offset_end) 
+        {
+          if (*offset_here == ';')
+            {
+              if (offsettext.empty())
+            {
+              offset_resultset.push_back ("0");
+            }
+              else
+            {
+              offset_resultset.push_back (offsettext);
+            }
+              offsettext.clear();
+            } 
+          else 
+            {
+              offsettext.push_back(*offset_here);
+            }
+          
+          offset_here++;
+        }
+          // insert the last result in the set
+          if (!offsettext.empty()) offset_resultset.push_back (offsettext);
+        }
+      else
+        {
+          // add 0 offset for each 'contains' entry
+          text_tarray::iterator result_here = resultset.begin();
+          text_tarray::iterator result_end = resultset.end();
+          while (result_here != result_end) {
+        offset_resultset.push_back("0");
+        result_here++;
+          }
+        }
+
+      // do an intersection with the input set
+      if (!request.docSet.empty()) {
+
+        text_tarray intersect_resultset;
+        text_tarray intersect_offset_resultset;
+        
+        text_tarray::const_iterator resultset_here = resultset.begin();
+        text_tarray::const_iterator resultset_end = resultset.end();
+        text_tarray::const_iterator offset_resultset_here = offset_resultset.begin();
+        
+        while (resultset_here != resultset_end) {
+          if (in_set (request.docSet, *resultset_here))
+        {
+          intersect_resultset.push_back (*resultset_here);
+          intersect_offset_resultset.push_back (*offset_resultset_here);
+        }
+          resultset_here ++;
+          offset_resultset_here ++;
+        }
+        resultset = intersect_resultset;
+        offset_resultset = intersect_offset_resultset;
+      }
+    }
+      else
+    {
+      // do an intersection with the input set
+      if (!request.docSet.empty()) {
+        intersect (resultset, request.docSet);
+      }
+    }
 
       // create the response
@@ -218 +293 @@
       text_tarray::iterator result_here = resultset.begin();
       text_tarray::iterator result_end = resultset.end();
+      text_tarray::iterator offset_result_here = offset_resultset.begin();
 
       while (result_here != result_end) {
@@ -223 +299 @@
     if (resultnum >= startresults) {
       resultdoc.OID = (*result_here);
+      if (!md_type.empty())
+        {
+          resultdoc.classifier_metadata_type = md_type;
+          resultdoc.classifier_metadata_offset = offset_result_here->getint();
+        }
       response.docInfo.push_back(resultdoc);
     }
@@ -228 +309 @@
     resultnum++;
     result_here++;
+    if (!md_type.empty()) offset_result_here++;
       }
     }