diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp
index 967715dc..9f7ae7ce 100644
--- a/src/qtgui/snippets_w.cpp
+++ b/src/qtgui/snippets_w.cpp
@@ -136,19 +136,26 @@ void SnippetsW::init()
""
""
- ""
- ""
+ ""
+ ""
;
g_hiliter.set_inputhtml(false);
+ bool nomatch = true;
for (vector::const_iterator it = vpabs.begin();
it != vpabs.end(); it++) {
+ if (it->page == -1) {
+ oss << "| " <<
+ it->snippet << " |
" << endl;
+ continue;
+ }
list lr;
if (!g_hiliter.plaintorich(it->snippet, lr, hdata)) {
LOGDEB1(("No match for [%s]\n", it->snippet.c_str()));
continue;
}
+ nomatch = false;
oss << "| ";
if (it->page > 0) {
oss << "page << "T" << it->term << "\">"
@@ -156,6 +163,13 @@ void SnippetsW::init()
}
oss << " | " << lr.front().c_str() << " |
" << endl;
}
+ oss << "
" << endl;
+ if (nomatch) {
+ oss.str("");
+ oss << "Sorry, no exact match was found within limits. "
+ "Probably the document is very big "
+ "and the snippets generator got lost in a maze...
" << endl;
+ }
oss << "";
#ifdef SNIPPETS_WEBKIT
browser->setHtml(QString::fromUtf8(oss.str().c_str()));
diff --git a/src/query/docseqdb.cpp b/src/query/docseqdb.cpp
index e583dc17..3c3a3c5a 100644
--- a/src/query/docseqdb.cpp
+++ b/src/query/docseqdb.cpp
@@ -69,6 +69,7 @@ int DocSequenceDb::getResCnt()
}
return m_rescnt;
}
+
static const string cstr_mre("[...]");
// This one only gets called to fill-up the snippets window
@@ -81,18 +82,22 @@ bool DocSequenceDb::getAbstract(Rcl::Doc &doc, vector& vpabs)
// Have to put the limit somewhere.
int maxoccs = 1000;
- Rcl::abstract_result ret = Rcl::ABSRES_ERROR;
+ int ret = Rcl::ABSRES_ERROR;
if (m_q->whatDb()) {
ret = m_q->makeDocAbstract(doc, vpabs, maxoccs,
m_q->whatDb()->getAbsCtxLen()+ 2);
}
- if (vpabs.empty())
- vpabs.push_back(Rcl::Snippet(0, doc.meta[Rcl::Doc::keyabs]));
+ LOGDEB(("DocSequenceDb::getAbstract: got ret %d vpabs len %u\n", ret,
+ vpabs.size()));
+ if (vpabs.empty()) {
+ return true;
+ }
// If the list was probably truncated, indicate it.
- if (ret == Rcl::ABSRES_TRUNC) {
+ if (ret | Rcl::ABSRES_TRUNC) {
vpabs.push_back(Rcl::Snippet(-1, cstr_mre));
- } else if (ret == Rcl::ABSRES_TERMMISS) {
+ }
+ if (ret | Rcl::ABSRES_TERMMISS) {
vpabs.insert(vpabs.begin(),
Rcl::Snippet(-1, "(Words missing in snippets)"));
}
diff --git a/src/rcldb/rclabstract.cpp b/src/rcldb/rclabstract.cpp
index 307634ab..e60dace9 100644
--- a/src/rcldb/rclabstract.cpp
+++ b/src/rcldb/rclabstract.cpp
@@ -309,9 +309,9 @@ int Query::Native::getFirstMatchPage(Xapian::docid docid, string& term)
//
// DatabaseModified and other general exceptions are catched and
// possibly retried by our caller
-abstract_result Query::Native::makeAbstract(Xapian::docid docid,
- vector& vabs,
- int imaxoccs, int ictxwords)
+int Query::Native::makeAbstract(Xapian::docid docid,
+ vector& vabs,
+ int imaxoccs, int ictxwords)
{
Chrono chron;
LOGABS(("makeAbstract: docid %ld imaxoccs %d ictxwords %d\n",
@@ -381,7 +381,7 @@ abstract_result Query::Native::makeAbstract(Xapian::docid docid,
LOGABS(("makeAbstract:%d: mxttloccs %d ctxwords %d\n",
chron.ms(), maxtotaloccs, ctxwords));
- abstract_result ret = ABSRES_OK;
+ int ret = ABSRES_OK;
// Let's go populate
for (map >::reverse_iterator mit = byQ.rbegin();
@@ -466,11 +466,14 @@ abstract_result Query::Native::makeAbstract(Xapian::docid docid,
}
// Group done ?
- if (grpoccs >= maxgrpoccs)
+ if (grpoccs >= maxgrpoccs) {
+ ret |= ABSRES_TRUNC;
+ LOGABS(("Db::makeAbstract: max group occs cutoff\n"));
break;
+ }
// Global done ?
if (totaloccs >= maxtotaloccs) {
- ret = ABSRES_TRUNC;
+ ret |= ABSRES_TRUNC;
LOGABS(("Db::makeAbstract: max occurrences cutoff\n"));
break;
}
@@ -480,7 +483,7 @@ abstract_result Query::Native::makeAbstract(Xapian::docid docid,
}
if (totaloccs >= maxtotaloccs) {
- ret = ABSRES_TRUNC;
+ ret |= ABSRES_TRUNC;
LOGABS(("Db::makeAbstract: max1 occurrences cutoff\n"));
break;
}
@@ -511,7 +514,7 @@ abstract_result Query::Native::makeAbstract(Xapian::docid docid,
if (has_prefix(*term))
continue;
if (m_q->m_snipMaxPosWalk > 0 && cutoff-- < 0) {
- ret = ABSRES_TERMMISS;
+ ret |= ABSRES_TERMMISS;
LOGDEB0(("makeAbstract: max term count cutoff %d\n",
m_q->m_snipMaxPosWalk));
break;
@@ -522,7 +525,7 @@ abstract_result Query::Native::makeAbstract(Xapian::docid docid,
for (pos = xrdb.positionlist_begin(docid, *term);
pos != xrdb.positionlist_end(docid, *term); pos++) {
if (m_q->m_snipMaxPosWalk > 0 && cutoff-- < 0) {
- ret = ABSRES_TERMMISS;
+ ret |= ABSRES_TERMMISS;
LOGDEB0(("makeAbstract: max term count cutoff %d\n",
m_q->m_snipMaxPosWalk));
break;
diff --git a/src/rcldb/rclquery.cpp b/src/rcldb/rclquery.cpp
index e48d70ec..ece076c9 100644
--- a/src/rcldb/rclquery.cpp
+++ b/src/rcldb/rclquery.cpp
@@ -264,16 +264,16 @@ bool Query::getQueryTerms(vector& terms)
return true;
}
-abstract_result Query::makeDocAbstract(Doc &doc,
- vector& abstract,
- int maxoccs, int ctxwords)
+int Query::makeDocAbstract(Doc &doc,
+ vector& abstract,
+ int maxoccs, int ctxwords)
{
LOGDEB(("makeDocAbstract: maxoccs %d ctxwords %d\n", maxoccs, ctxwords));
if (!m_db || !m_db->m_ndb || !m_db->m_ndb->m_isopen || !m_nq) {
LOGERR(("Query::makeDocAbstract: no db or no nq\n"));
return ABSRES_ERROR;
}
- abstract_result ret = ABSRES_ERROR;
+ int ret = ABSRES_ERROR;
XAPTRY(ret = m_nq->makeAbstract(doc.xdocid, abstract, maxoccs, ctxwords),
m_db->m_ndb->xrdb, m_reason);
if (!m_reason.empty()) {
diff --git a/src/rcldb/rclquery.h b/src/rcldb/rclquery.h
index e51f6d94..79886ef2 100644
--- a/src/rcldb/rclquery.h
+++ b/src/rcldb/rclquery.h
@@ -33,7 +33,7 @@ enum abstract_result {
ABSRES_ERROR = 0,
ABSRES_OK = 1,
ABSRES_TRUNC = 2,
- ABSRES_TERMMISS = 3
+ ABSRES_TERMMISS = 4
};
// Snippet entry for makeDocAbstract
@@ -110,8 +110,8 @@ class Query {
// Returned as a snippets vector
bool makeDocAbstract(Doc &doc, std::vector& abstract);
// Returned as a vector of pair page is 0 if unknown
- abstract_result makeDocAbstract(Doc &doc, std::vector& abst,
- int maxoccs= -1, int ctxwords = -1);
+ int makeDocAbstract(Doc &doc, std::vector& abst,
+ int maxoccs= -1, int ctxwords = -1);
/** Retrieve page number for first match for term */
int getFirstMatchPage(Doc &doc, std::string& term);
diff --git a/src/rcldb/rclquery_p.h b/src/rcldb/rclquery_p.h
index 08f67c49..77f61ab2 100644
--- a/src/rcldb/rclquery_p.h
+++ b/src/rcldb/rclquery_p.h
@@ -59,8 +59,8 @@ public:
}
/** Return a list of terms which matched for a specific result document */
bool getMatchTerms(unsigned long xdocid, std::vector& terms);
- abstract_result makeAbstract(Xapian::docid id, vector&,
- int maxoccs = -1, int ctxwords = -1);
+ int makeAbstract(Xapian::docid id, vector&,
+ int maxoccs = -1, int ctxwords = -1);
int getFirstMatchPage(Xapian::docid docid, std::string& term);
void setDbWideQTermsFreqs();
double qualityTerms(Xapian::docid docid,