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

rclquery: fixed log call formats and indentation

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-12-07 10:44:54 +01:00
parent ab5a628b9b
commit 653b1fb5a5
1 changed files with 172 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/rcldb/rclquery.cpp
View File

@ -132,7 +132,7 @@ public:
sortterm = sortterm.substr(i1, sortterm.size()-i1);
}
LOGDEB2("QSorter: [" << (term) << "] -> [" << (sortterm) << "]\n" );
LOGDEB2("QSorter: [" << term << "] -> [" << sortterm << "]\n");
return sortterm;
}
@ -166,7 +166,8 @@ void Query::setSortBy(const string& fld, bool ascending) {
m_sortField = m_db->getConf()->fieldQCanon(fld);
m_sortAscending = ascending;
}
LOGDEB0("RclQuery::setSortBy: [" << (m_sortField) << "] " << (m_sortAscending ? "ascending" : "descending") << "\n" );
LOGDEB0("RclQuery::setSortBy: [" << m_sortField << "] " <<
(m_sortAscending ? "ascending" : "descending") << "\n");
}
//#define ISNULL(X) (X).isNull()
@ -175,10 +176,10 @@ void Query::setSortBy(const string& fld, bool ascending) {
// Prepare query out of user search data
bool Query::setQuery(std::shared_ptr<SearchData> sdata)
{
LOGDEB("Query::setQuery:\n" );
LOGDEB("Query::setQuery:\n");
if (!m_db || ISNULL(m_nq)) {
LOGERR("Query::setQuery: not initialised!\n" );
LOGERR("Query::setQuery: not initialised!\n");
return false;
}
m_resCnt = -1;
@ -232,7 +233,7 @@ bool Query::setQuery(std::shared_ptr<SearchData> sdata)
}
if (!m_reason.empty()) {
LOGDEB("Query::SetQuery: xapian error " << (m_reason) << "\n" );
LOGDEB("Query::SetQuery: xapian error " << m_reason << "\n");
return false;
}
@ -241,7 +242,7 @@ bool Query::setQuery(std::shared_ptr<SearchData> sdata)
sdata->setDescription(d);
m_sd = sdata;
LOGDEB("Query::SetQuery: Q: " << (sdata->getDescription()) << "\n" );
LOGDEB("Query::SetQuery: Q: " << sdata->getDescription() << "\n");
return true;
}
@ -260,26 +261,26 @@ bool Query::getQueryTerms(vector<string>& terms)
}
} XCATCHERROR(ermsg);
if (!ermsg.empty()) {
LOGERR("getQueryTerms: xapian error: " << (ermsg) << "\n" );
LOGERR("getQueryTerms: xapian error: " << ermsg << "\n");
return false;
}
return true;
}
int Query::makeDocAbstract(const Doc &doc,
vector<Snippet>& abstract,
int Query::makeDocAbstract(const Doc &doc, vector<Snippet>& abstract,
int maxoccs, int ctxwords)
{
LOGDEB("makeDocAbstract: maxoccs " << (maxoccs) << " ctxwords " << (ctxwords) << "\n" );
LOGDEB("makeDocAbstract: maxoccs " << maxoccs << " ctxwords " <<
ctxwords << "\n");
if (!m_db || !m_db->m_ndb || !m_db->m_ndb->m_isopen || !m_nq) {
LOGERR("Query::makeDocAbstract: no db or no nq\n" );
LOGERR("Query::makeDocAbstract: no db or no nq\n");
return 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()) {
LOGDEB("makeDocAbstract: makeAbstract error, reason: " << (m_reason) << "\n" );
LOGDEB("makeDocAbstract: makeAbstract: reason: " << m_reason << "\n");
return ABSRES_ERROR;
}
return ret;
@ -319,9 +320,9 @@ bool Query::makeDocAbstract(const Doc &doc, string& abstract)
int Query::getFirstMatchPage(const Doc &doc, string& term)
{
LOGDEB1("Db::getFirstMatchPage\n" );;
LOGDEB1("Db::getFirstMatchPage\n");;
if (!m_nq) {
LOGERR("Query::getFirstMatchPage: no nq\n" );
LOGERR("Query::getFirstMatchPage: no nq\n");
return false;
}
int pagenum = -1;
@ -339,7 +340,7 @@ static const int qquantum = 50;
int Query::getResCnt()
{
if (ISNULL(m_nq) || !m_nq->xenquire) {
LOGERR("Query::getResCnt: no query opened\n" );
LOGERR("Query::getResCnt: no query opened\n");
return -1;
}
if (m_resCnt >= 0)
@ -354,9 +355,9 @@ int Query::getResCnt()
m_resCnt = m_nq->xmset.get_matches_lower_bound(),
m_db->m_ndb->xrdb, m_reason);
LOGDEB("Query::getResCnt: " << (m_resCnt) << " " << (chron.millis()) << " mS\n" );
LOGDEB("Query::getResCnt: "<<m_resCnt<<" "<< chron.millis() << " mS\n");
if (!m_reason.empty())
LOGERR("xenquire->get_mset: exception: " << (m_reason) << "\n" );
LOGERR("xenquire->get_mset: exception: " << m_reason << "\n");
} else {
m_resCnt = m_nq->xmset.get_matches_lower_bound();
}
@ -373,9 +374,9 @@ int Query::getResCnt()
// on subsequent calls is probably only due to disk caching.
bool Query::getDoc(int xapi, Doc &doc)
{
LOGDEB1("Query::getDoc: xapian enquire index " << (xapi) << "\n" );
LOGDEB1("Query::getDoc: xapian enquire index " << xapi << "\n");
if (ISNULL(m_nq) || !m_nq->xenquire) {
LOGERR("Query::getDoc: no query opened\n" );
LOGERR("Query::getDoc: no query opened\n");
return false;
}
@ -383,18 +384,18 @@ bool Query::getDoc(int xapi, Doc &doc)
int last = first + m_nq->xmset.size() -1;
if (!(xapi >= first && xapi <= last)) {
LOGDEB("Fetching for first " << (xapi) << ", count " << (qquantum) << "\n" );
LOGDEB("Fetching for first " << xapi << ", count " << qquantum << "\n");
XAPTRY(m_nq->xmset = m_nq->xenquire->get_mset(xapi, qquantum,
(const Xapian::RSet *)0),
m_db->m_ndb->xrdb, m_reason);
if (!m_reason.empty()) {
LOGERR("enquire->get_mset: exception: " << (m_reason) << "\n" );
LOGERR("enquire->get_mset: exception: " << m_reason << "\n");
return false;
}
if (m_nq->xmset.empty()) {
LOGDEB("enquire->get_mset: got empty result\n" );
LOGDEB("enquire->get_mset: got empty result\n");
return false;
}
first = m_nq->xmset.get_firstitem();
@ -418,7 +419,8 @@ bool Query::getDoc(int xapi, Doc &doc)
m_reason.erase();
Chrono chron;
m_db->m_ndb->xdocToUdi(xdoc, udi);
LOGDEB2("Query::getDoc: " << (chron.millis()) << " ms for udi [" << (udi) << "], collapse count " << (collapsecount) << "\n" );
LOGDEB2("Query::getDoc: " << chron.millis() << " ms for udi [" <<
udi << "], collapse count " << collapsecount << "\n");
break;
} catch (Xapian::DatabaseModifiedError &error) {
// retry or end of loop
@ -429,7 +431,7 @@ bool Query::getDoc(int xapi, Doc &doc)
break;
}
if (!m_reason.empty()) {
LOGERR("Query::getDoc: " << (m_reason) << "\n" );
LOGERR("Query::getDoc: " << m_reason << "\n");
return false;
}
doc.meta[Rcl::Doc::keyudi] = udi;
@ -454,10 +456,10 @@ bool Query::getDoc(int xapi, Doc &doc)
vector<string> Query::expand(const Doc &doc)
{
LOGDEB("Rcl::Query::expand()\n" );
LOGDEB("Rcl::Query::expand()\n");
vector<string> res;
if (ISNULL(m_nq) || !m_nq->xenquire) {
LOGERR("Query::expand: no query opened\n" );
LOGERR("Query::expand: no query opened\n");
return res;
}
@ -467,11 +469,11 @@ vector<string> Query::expand(const Doc &doc)
rset.add_document(Xapian::docid(doc.xdocid));
// We don't exclude the original query terms.
Xapian::ESet eset = m_nq->xenquire->get_eset(20, rset, false);
LOGDEB("ESet terms:\n" );
LOGDEB("ESet terms:\n");
// We filter out the special terms
for (Xapian::ESetIterator it = eset.begin();
it != eset.end(); it++) {
LOGDEB(" [" << ((*it)) << "]\n" );
LOGDEB(" [" << (*it) << "]\n");
if ((*it).empty() || has_prefix(*it))
continue;
res.push_back(*it);
@ -489,7 +491,7 @@ vector<string> Query::expand(const Doc &doc)
}
if (!m_reason.empty()) {
LOGERR("Query::expand: xapian error " << (m_reason) << "\n" );
LOGERR("Query::expand: xapian error " << m_reason << "\n");
res.clear();
}