Changeset 16915

Timestamp:

2008-08-20T15:40:00+12:00 (16 years ago)

Author:

mdewsnip

Message:

Changes made by Richard Managh at DL Consulting Ltd for returning document-level term frequency totals.

Location:

gsdl/trunk/runtime-src/src

Files:

• colservr/expat_resultset.cpp (modified) (1 diff)
• colservr/lucenequeryfilter.cpp (modified) (1 diff)
• recpt/formattools.cpp (modified) (2 diffs)
• recpt/formattools.h (modified) (1 diff)

gsdl/trunk/runtime-src/src/colservr/expat_resultset.cpp

@@ -98 +98 @@
       doc.docnum = id_num;
       doc.docweight = qrpack_ptr->match_count;
+
+      char* termfreq = get_attribute(attributes, "termfreq");
+      if (termfreq != NULL)
+      {
+    doc.num_query_terms_matched = atoi(termfreq);
+      }
+
       queryresult_ptr->docs.docset[doc.docnum] = doc;
       queryresult_ptr->docs.docorder.push_back(doc.docnum);

gsdl/trunk/runtime-src/src/colservr/lucenequeryfilter.cpp

@@ -202 +202 @@
                 resultdoc.result_num = resultnum;
                 resultdoc.ranking = (int)((*docset_here).second.docweight * 10000.0 + 0.5);
+                resultdoc.num_terms_matched = (*docset_here).second.num_query_terms_matched;
                 
                 response.docInfo.push_back (resultdoc);

gsdl/trunk/runtime-src/src/recpt/formattools.cpp

@@ -561 +561 @@
   else if (meta == "DocRank")
     formatlistptr->command = comRank;
+  else if (meta == "DocTermsFreqTotal")
+    formatlistptr->command = comDocTermsFreqTotal;
   else if (meta.size() >= 10 && (substr(meta.begin(), meta.begin()+10) == "collection")) {
     formatlistptr->command = comCollection;
@@ -1497 +1499 @@
     return get_or (collection,collectproto, docinfo, disp, formatlistptr->orptr, 
                options, logout);
+     case comDocTermsFreqTotal:
+       return docinfo.num_terms_matched;
      case comCollection:
        if (formatlistptr->meta.metaname == g_EmptyText) {

gsdl/trunk/runtime-src/src/recpt/formattools.h

@@ -35 +35 @@
         comDoc, comHighlight, comEndHighlight, comRel, comHref, comSummary,
         comTOC, comImage, comDocumentButtonDetach, comDocumentButtonHighlight,
-        comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comTopOID, comRank, comCollection};
+        comDocumentButtonExpandContents, comDocumentButtonExpandText, comOID, comTopOID, comRank,
+        comCollection, comDocTermsFreqTotal};
 
 enum mcommand_t {mNone=0, mCgiSafe=1, mParent=2, mSibling=4, mChild=8, mSpecial=16};