tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix term highlighting for field searches

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-01-28 15:47:58 +01:00
parent 50238d5577
commit e8fcd35fef
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/rcldb/searchdata.cpp
View File

@ -597,7 +597,11 @@ void StringToXapianQ::processSimpleSpan(const string& span, bool nostemexp,
string sterm; // dumb version of user term string sterm; // dumb version of user term
string prefix; string prefix;
expandTerm(nostemexp, span, exp, sterm, &prefix); expandTerm(nostemexp, span, exp, sterm, &prefix);
m_terms.insert(m_terms.end(), exp.begin(), exp.end()); // m_terms is used for highlighting, we don't want prefixes in there.
for (list<string>::const_iterator it = exp.begin();
it != exp.end(); it++) {
m_terms.push_back(it->substr(prefix.size()));
}
// Push either term or OR of stem-expanded set // Push either term or OR of stem-expanded set
Xapian::Query xq(Xapian::Query::OP_OR, exp.begin(), exp.end()); Xapian::Query xq(Xapian::Query::OP_OR, exp.begin(), exp.end());
@ -640,8 +644,16 @@ void StringToXapianQ::processPhraseOrNear(TextSplitQ *splitData,
string sterm; string sterm;
list<string>exp; list<string>exp;
expandTerm(nostemexp, *it, exp, sterm); string prefix;
groups.push_back(vector<string>(exp.begin(), exp.end())); expandTerm(nostemexp, *it, exp, sterm, &prefix);
// groups is used for highlighting, we don't want prefixes in there.
vector<string> noprefs;
for (list<string>::const_iterator it = exp.begin();
it != exp.end(); it++) {
noprefs.push_back(it->substr(prefix.size()));
}
groups.push_back(noprefs);
orqueries.push_back(Xapian::Query(Xapian::Query::OP_OR, orqueries.push_back(Xapian::Query(Xapian::Query::OP_OR,
exp.begin(), exp.end())); exp.begin(), exp.end()));
#ifdef XAPIAN_NEAR_EXPAND_SINGLE_BUF #ifdef XAPIAN_NEAR_EXPAND_SINGLE_BUF