Changeset 447 for trunk/gsdl/src/recpt/queryaction.cpp

Timestamp:

1999-08-11T10:46:33+12:00 (25 years ago)

Author:

sjboddie

Message:

changed format option result to QueryResults and added QueryLinks option

File:

• trunk/gsdl/src/recpt/queryaction.cpp (modified) (5 diffs)

trunk/gsdl/src/recpt/queryaction.cpp

@@ -12 +12 @@
 /*
    $Log$
+   Revision 1.18  1999/08/10 22:46:33  sjboddie
+   changed format option result to QueryResults and added QueryLinks option
+
    Revision 1.17  1999/07/30 02:24:42  sjboddie
    added collectinfo argument to some functions
@@ -432 +435 @@
 
   if (formatstring.empty()) {
-    text_tmap::const_iterator result = collectinfo.format.find("result");
+    text_tmap::const_iterator result = collectinfo.format.find("QueryResults");
     if (result != collectinfo.format.end())
       formatstring = (*result).second;
+  }
+
+  // see if there's a QueryLinks format option
+  text_t querylinkmeta;
+  bool havequerylink = false;
+  text_tmap::const_iterator it = collectinfo.format.find("QueryLinks");
+  if (it != collectinfo.format.end()) {
+    querylinkmeta = (*it).second;
+    havequerylink = true;
   }
 
@@ -453 +465 @@
 
     parse_formatstring (formatstring, formatlistptr, request.fields, request.getParents);
+
+    if (havequerylink)
+      request.fields.push_back (querylinkmeta);
+
+    int metasize = request.fields.size();
 
     // do the query
@@ -475 +492 @@
       // those that did match will have been sorted to the top
       if ((*this_doc).num_phrase_match < num_phrases) break;
-      textout << outconvert << disp << "<tr>\n"
-    
-    //            << "<td valign=top nowrap>r: " << (*this_doc).ranking
-    //            << " t: " << (*this_doc).num_terms_matched << " p: "
-    //            << (*this_doc).num_phrase_match << "</td>\n"
-    
-          << get_formatted_string (*this_doc, formatlistptr) << "\n"
-          << "</tr>\n";
+      textout << "<tr>\n";
+      if (havequerylink) {
+    const text_t &qlmeta = (*this_doc).metadata[metasize-1].values.back();
+    if (qlmeta.empty())
+      textout << outconvert << disp 
+          << get_formatted_string (*this_doc, formatlistptr, "", "_icontext_") << "\n";
+    else
+      textout << outconvert << disp 
+          << get_formatted_string (*this_doc, formatlistptr) << "\n";
+      } else {
+    textout << outconvert << disp 
+        << get_formatted_string (*this_doc, formatlistptr) << "\n";
+      }
+      textout << "</tr>\n";
 
       this_doc ++;
@@ -537 +560 @@
   }
 
-  if (isApprox == MoreThan && numdocs > maxdocs) numdocs = maxdocs;
+  //  if (isApprox == MoreThan && numdocs > maxdocs) numdocs = maxdocs;
+  if (numdocs > maxdocs) {numdocs = maxdocs; isApprox = MoreThan;}
 
   if (isApprox == Approximate) resline = "_textapprox_";