yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

changed variable names for clarity

Browse source
This commit is contained in:
Jean-Francois Dockes 2012-09-19 19:49:43 +02:00
parent 80c1ab84a4
commit 64571dcb84
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/rcldb/rcldb.cpp
View file

@ -220,7 +220,9 @@ static void listList(const string&, const vector<string>&)
} }
#endif #endif
// Retrieve and store db-wide frequencies for the query terms. // Retrieve db-wide frequencies for the query terms and store them in
// the query object. This is done at most once for a query, and the data is used
// while computing abstracts for the different result documents.
void Db::Native::setDbWideQTermsFreqs(Query *query) void Db::Native::setDbWideQTermsFreqs(Query *query)
{ {
// Do it once only for a given query. // Do it once only for a given query.
@ -420,18 +422,17 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
m_rcldb->m_synthAbsLen, m_rcldb->m_synthAbsWordCtxLen)); m_rcldb->m_synthAbsLen, m_rcldb->m_synthAbsWordCtxLen));
// The (unprefixed) terms matched by this document // The (unprefixed) terms matched by this document
vector<string> terms; vector<string> matchedTerms;
{ {
vector<string> iterms; vector<string> iterms;
query->getMatchTerms(docid, iterms); query->getMatchTerms(docid, iterms);
noPrefixList(iterms, terms); noPrefixList(iterms, matchedTerms);
if (terms.empty()) { if (matchedTerms.empty()) {
LOGDEB(("makeAbstract::Empty term list\n")); LOGDEB(("makeAbstract::Empty term list\n"));
return vector<string>(); return vector<string>();
} }
} }
listList("Match terms: ", terms); listList("Match terms: ", matchedTerms);
// Retrieve the term freqencies for the query terms. This is // Retrieve the term freqencies for the query terms. This is
// actually computed only once for a query, and for all terms in // actually computed only once for a query, and for all terms in
@ -446,7 +447,7 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
// removing its meaning from the maximum occurrences per term test // removing its meaning from the maximum occurrences per term test
// used while walking the list below) // used while walking the list below)
multimap<double, string> byQ; multimap<double, string> byQ;
double totalweight = qualityTerms(docid, query, terms, byQ); double totalweight = qualityTerms(docid, query, matchedTerms, byQ);
LOGABS(("makeAbstract:%d: computed Qcoefs.\n", chron.ms())); LOGABS(("makeAbstract:%d: computed Qcoefs.\n", chron.ms()));
// This can't happen, but would crash us // This can't happen, but would crash us
if (totalweight == 0.0) { if (totalweight == 0.0) {
@ -464,8 +465,8 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
// terms, at their positions around the search terms positions: // terms, at their positions around the search terms positions:
map<unsigned int, string> sparseDoc; map<unsigned int, string> sparseDoc;
// All the chosen query term positions. // Total number of occurences for all terms. We stop when we have too much
vector<unsigned int> qtermposs; int totaloccs = 0;
// Limit the total number of slots we populate. The 7 is taken as // Limit the total number of slots we populate. The 7 is taken as
// average word size. It was a mistake to have the user max // average word size. It was a mistake to have the user max
@ -499,7 +500,10 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
Xapian::PositionIterator pos; Xapian::PositionIterator pos;
// There may be query terms not in this doc. This raises an // There may be query terms not in this doc. This raises an
// exception when requesting the position list, we catch it. // exception when requesting the position list, we catch it ??
// Not clear how this can happen because we are walking the
// match list returned by Xapian. Maybe something with the
// fields?
string emptys; string emptys;
try { try {
unsigned int occurrences = 0; unsigned int occurrences = 0;
@ -510,8 +514,8 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
continue; continue;
LOGABS(("makeAbstract: [%s] at %d occurrences %d maxoccs %d\n", LOGABS(("makeAbstract: [%s] at %d occurrences %d maxoccs %d\n",
qterm.c_str(), ipos, occurrences, maxoccs)); qterm.c_str(), ipos, occurrences, maxoccs));
// Remember the term position
qtermposs.push_back(ipos); totaloccs++;
// Add adjacent slots to the set to populate at next // Add adjacent slots to the set to populate at next
// step by inserting empty strings. Special provisions // step by inserting empty strings. Special provisions
@ -543,21 +547,21 @@ vector<string> Db::Native::makeAbstract(Xapian::docid docid, Query *query)
// Limit to allocated occurences and total size // Limit to allocated occurences and total size
if (++occurrences >= maxoccs || if (++occurrences >= maxoccs ||
qtermposs.size() >= maxtotaloccs) totaloccs >= maxtotaloccs)
break; break;
} }
} catch (...) { } catch (...) {
// Term does not occur. No problem. // Term does not occur. No problem.
} }
if (qtermposs.size() >= maxtotaloccs) if (totaloccs >= maxtotaloccs)
break; break;
} }
LOGABS(("makeAbstract:%d:chosen number of positions %d\n", LOGABS(("makeAbstract:%d:chosen number of positions %d\n",
chron.millis(), qtermposs.size())); chron.millis(), totaloccs));
// This can happen if there are term occurences in the keywords // This can happen if there are term occurences in the keywords
// etc. but not elsewhere ? // etc. but not elsewhere ?
if (qtermposs.size() == 0) { if (totaloccs == 0) {
LOGDEB1(("makeAbstract: no occurrences\n")); LOGDEB1(("makeAbstract: no occurrences\n"));
return vector<string>(); return vector<string>();
} }