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

logs

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-05-18 16:50:12 +02:00
parent ef5eed8bc6
commit 81a91404a4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/rcldb/rclterms.cpp
View File

@ -270,17 +270,18 @@ bool Db::termMatch(int typ_sens, const string &lang, const string &_term,
exp1.swap(lexp); exp1.swap(lexp);
sort(lexp.begin(), lexp.end()); sort(lexp.begin(), lexp.end());
lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end()); lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end());
LOGDEB("ExpTerm: stemexp: " << stringsToString(lexp) << "\n"); LOGDEB("Db::TermMatch: stemexp: " << stringsToString(lexp)
<< "\n");
} }
if (m_syngroups.ok() && (typ_sens & ET_SYNEXP)) { if (m_syngroups.ok() && (typ_sens & ET_SYNEXP)) {
LOGDEB("ExpTerm: got syngroups\n"); LOGDEB("Db::TermMatch: got syngroups\n");
vector<string> exp1(lexp); vector<string> exp1(lexp);
for (const auto& term : lexp) { for (const auto& term : lexp) {
vector<string> sg = m_syngroups.getgroup(term); vector<string> sg = m_syngroups.getgroup(term);
if (!sg.empty()) { if (!sg.empty()) {
LOGDEB("ExpTerm: syns: " << term << " -> " << LOGDEB("Db::TermMatch: syngroups out: " <<
stringsToString(sg) << "\n"); term << " -> " << stringsToString(sg) << "\n");
for (const auto& synonym : sg) { for (const auto& synonym : sg) {
if (synonym.find_first_of(" ") != string::npos) { if (synonym.find_first_of(" ") != string::npos) {
if (multiwords) { if (multiwords) {
@ -297,8 +298,8 @@ bool Db::termMatch(int typ_sens, const string &lang, const string &_term,
lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end()); lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end());
} }
// Expand the resulting list for case (all stemdb content // Expand the resulting list for case and diacritics (all
// is case-folded) // stemdb content is case-folded)
vector<string> exp1; vector<string> exp1;
for (const auto& term: lexp) { for (const auto& term: lexp) {
synac.synExpand(term, exp1); synac.synExpand(term, exp1);
@ -308,8 +309,10 @@ bool Db::termMatch(int typ_sens, const string &lang, const string &_term,
lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end()); lexp.erase(unique(lexp.begin(), lexp.end()), lexp.end());
} }
// Filter the result and get the stats, possibly add prefixes. // Filter the result against the index and get the stats,
LOGDEB("ExpandTerm:TM: lexp: " << stringsToString(lexp) << "\n"); // possibly add prefixes.
LOGDEB("Db::TermMatch: final lexp before idx filter: " <<
stringsToString(lexp) << "\n");
for (const auto& term : lexp) { for (const auto& term : lexp) {
idxTermMatch(Rcl::Db::ET_WILD, "", term, res, max, field); idxTermMatch(Rcl::Db::ET_WILD, "", term, res, max, field);
} }