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

fix log messages whitespace and line breaks

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-06-05 14:31:08 +02:00
parent e5ec234f56
commit 16250f6096
1 changed files with 188 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
src/rcldb/rcldb.cpp
View File

@ -154,12 +154,12 @@ Db::Native::Native(Db *db)
m_totalworkns(0LL), m_havewriteq(false) m_totalworkns(0LL), m_havewriteq(false)
#endif // IDX_THREADS #endif // IDX_THREADS
{ {
LOGDEB1("Native::Native: me " << (this) << "\n" ); LOGDEB1("Native::Native: me " << this << "\n");
} }
Db::Native::~Native() Db::Native::~Native()
{ {
LOGDEB1("Native::~Native: me " << (this) << "\n" ); LOGDEB1("Native::~Native: me " << this << "\n");
#ifdef IDX_THREADS #ifdef IDX_THREADS
if (m_havewriteq) { if (m_havewriteq) {
void *status = m_wqueue.setTerminateAndWait(); void *status = m_wqueue.setTerminateAndWait();
@ -187,20 +187,20 @@ void *DbUpdWorker(void* vdbp)
bool status = false; bool status = false;
switch (tsk->op) { switch (tsk->op) {
case DbUpdTask::AddOrUpdate: case DbUpdTask::AddOrUpdate:
LOGDEB("DbUpdWorker: got add/update task, ql " << (int(qsz)) << "\n" ); LOGDEB("DbUpdWorker: got add/update task, ql " << qsz << "\n");
status = ndbp->addOrUpdateWrite(tsk->udi, tsk->uniterm, status = ndbp->addOrUpdateWrite(tsk->udi, tsk->uniterm,
tsk->doc, tsk->txtlen); tsk->doc, tsk->txtlen);
break; break;
case DbUpdTask::Delete: case DbUpdTask::Delete:
LOGDEB("DbUpdWorker: got delete task, ql " << (int(qsz)) << "\n" ); LOGDEB("DbUpdWorker: got delete task, ql " << qsz << "\n");
status = ndbp->purgeFileWrite(false, tsk->udi, tsk->uniterm); status = ndbp->purgeFileWrite(false, tsk->udi, tsk->uniterm);
break; break;
case DbUpdTask::PurgeOrphans: case DbUpdTask::PurgeOrphans:
LOGDEB("DbUpdWorker: got orphans purge task, ql " << (int(qsz)) << "\n" ); LOGDEB("DbUpdWorker: got orphans purge task, ql " << qsz << "\n");
status = ndbp->purgeFileWrite(true, tsk->udi, tsk->uniterm); status = ndbp->purgeFileWrite(true, tsk->udi, tsk->uniterm);
break; break;
default: default:
LOGERR("DbUpdWorker: unknown op " << (tsk->op) << " !!\n" ); LOGERR("DbUpdWorker: unknown op " << tsk->op << " !!\n");
break; break;
} }
if (!status) { if (!status) {
@ -230,7 +230,8 @@ void Db::Native::maybeStartThreads()
} }
m_havewriteq = true; m_havewriteq = true;
} }
LOGDEB("RclDb:: threads: haveWriteQ " << (m_havewriteq) << ", wqlen " << (writeqlen) << " wqts " << (writethreads) << "\n" ); LOGDEB("RclDb:: threads: haveWriteQ " << m_havewriteq << ", wqlen " <<
writeqlen << " wqts " << writethreads << "\n");
} }
#endif // IDX_THREADS #endif // IDX_THREADS
@ -241,7 +242,7 @@ void Db::Native::maybeStartThreads()
bool Db::Native::subDocs(const string &udi, int idxi, bool Db::Native::subDocs(const string &udi, int idxi,
vector<Xapian::docid>& docids) vector<Xapian::docid>& docids)
{ {
LOGDEB2("subDocs: [" << (uniterm) << "]\n" ); LOGDEB2("subDocs: [" << uniterm << "]\n");
string pterm = make_parentterm(udi); string pterm = make_parentterm(udi);
vector<Xapian::docid> candidates; vector<Xapian::docid> candidates;
XAPTRY(docids.clear(); XAPTRY(docids.clear();
@ -249,7 +250,7 @@ bool Db::Native::subDocs(const string &udi, int idxi,
xrdb.postlist_end(pterm)), xrdb.postlist_end(pterm)),
xrdb, m_rcldb->m_reason); xrdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("Rcl::Db::subDocs: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Rcl::Db::subDocs: " << m_rcldb->m_reason << "\n");
return false; return false;
} else { } else {
for (unsigned int i = 0; i < candidates.size(); i++) { for (unsigned int i = 0; i < candidates.size(); i++) {
@ -257,7 +258,7 @@ bool Db::Native::subDocs(const string &udi, int idxi,
docids.push_back(candidates[i]); docids.push_back(candidates[i]);
} }
} }
LOGDEB0("Db::Native::subDocs: returning " << (docids.size()) << " ids\n" ); LOGDEB0("Db::Native::subDocs: returning " << docids.size() << " ids\n");
return true; return true;
} }
} }
@ -269,7 +270,7 @@ bool Db::Native::xdocToUdi(Xapian::Document& xdoc, string &udi)
xit.skip_to(wrap_prefix(udi_prefix)), xit.skip_to(wrap_prefix(udi_prefix)),
xrdb, m_rcldb->m_reason); xrdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("xdocToUdi: xapian error: " << (m_rcldb->m_reason) << "\n" ); LOGERR("xdocToUdi: xapian error: " << m_rcldb->m_reason << "\n");
return false; return false;
} }
if (xit != xdoc.termlist_end()) { if (xit != xdoc.termlist_end()) {
@ -287,27 +288,31 @@ bool Db::Native::xdocToUdi(Xapian::Document& xdoc, string &udi)
// posting, but we have to do it ourselves // posting, but we have to do it ourselves
bool Db::Native::clearDocTermIfWdf0(Xapian::Document& xdoc, const string& term) bool Db::Native::clearDocTermIfWdf0(Xapian::Document& xdoc, const string& term)
{ {
LOGDEB1("Db::clearDocTermIfWdf0: [" << (term) << "]\n" ); LOGDEB1("Db::clearDocTermIfWdf0: [" << term << "]\n");
// Find the term // Find the term
Xapian::TermIterator xit; Xapian::TermIterator xit;
XAPTRY(xit = xdoc.termlist_begin(); xit.skip_to(term);, XAPTRY(xit = xdoc.termlist_begin(); xit.skip_to(term);,
xrdb, m_rcldb->m_reason); xrdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("Db::clearDocTerm...: [" << (term) << "] skip failed: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Db::clearDocTerm...: [" << term << "] skip failed: " <<
m_rcldb->m_reason << "\n");
return false; return false;
} }
if (xit == xdoc.termlist_end() || term.compare(*xit)) { if (xit == xdoc.termlist_end() || term.compare(*xit)) {
LOGDEB0("Db::clearDocTermIFWdf0: term [" << (term) << "] not found. xit: [" << (xit == xdoc.termlist_end() ? "EOL":(*xit)) << "]\n" ); LOGDEB0("Db::clearDocTermIFWdf0: term [" << term <<
"] not found. xit: [" <<
(xit == xdoc.termlist_end() ? "EOL": *xit) << "]\n");
return false; return false;
} }
// Clear the term if its frequency is 0 // Clear the term if its frequency is 0
if (xit.get_wdf() == 0) { if (xit.get_wdf() == 0) {
LOGDEB1("Db::clearDocTermIfWdf0: clearing [" << (term) << "]\n" ); LOGDEB1("Db::clearDocTermIfWdf0: clearing [" << term << "]\n");
XAPTRY(xdoc.remove_term(term), xwdb, m_rcldb->m_reason); XAPTRY(xdoc.remove_term(term), xwdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGDEB0("Db::clearDocTermIfWdf0: failed [" << (term) << "]: " << (m_rcldb->m_reason) << "\n" ); LOGDEB0("Db::clearDocTermIfWdf0: failed [" << term << "]: " <<
m_rcldb->m_reason << "\n");
} }
} }
return true; return true;
@ -328,7 +333,8 @@ struct DocPosting {
bool Db::Native::clearField(Xapian::Document& xdoc, const string& pfx, bool Db::Native::clearField(Xapian::Document& xdoc, const string& pfx,
Xapian::termcount wdfdec) Xapian::termcount wdfdec)
{ {
LOGDEB1("Db::clearField: clearing prefix [" << (pfx) << "] for docid " << (unsigned(xdoc.get_docid())) << "\n" ); LOGDEB1("Db::clearField: clearing prefix [" << pfx << "] for docid " <<
xdoc.get_docid() << "\n");
vector<DocPosting> eraselist; vector<DocPosting> eraselist;
@ -342,7 +348,7 @@ bool Db::Native::clearField(Xapian::Document& xdoc, const string& pfx,
xit.skip_to(wrapd); xit.skip_to(wrapd);
while (xit != xdoc.termlist_end() && while (xit != xdoc.termlist_end() &&
!(*xit).compare(0, wrapd.size(), wrapd)) { !(*xit).compare(0, wrapd.size(), wrapd)) {
LOGDEB1("Db::clearfield: erasing for [" << ((*xit)) << "]\n" ); LOGDEB1("Db::clearfield: erasing for [" << *xit << "]\n");
Xapian::PositionIterator posit; Xapian::PositionIterator posit;
for (posit = xit.positionlist_begin(); for (posit = xit.positionlist_begin();
posit != xit.positionlist_end(); posit++) { posit != xit.positionlist_end(); posit++) {
@ -359,20 +365,23 @@ bool Db::Native::clearField(Xapian::Document& xdoc, const string& pfx,
break; break;
} }
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("Db::clearField: failed building erase list: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Db::clearField: failed building erase list: " <<
m_rcldb->m_reason << "\n");
return false; return false;
} }
// Now remove the found positions, and the terms if the wdf is 0 // Now remove the found positions, and the terms if the wdf is 0
for (vector<DocPosting>::const_iterator it = eraselist.begin(); for (vector<DocPosting>::const_iterator it = eraselist.begin();
it != eraselist.end(); it++) { it != eraselist.end(); it++) {
LOGDEB1("Db::clearField: remove posting: [" << (it->term) << "] pos [" << (int(it->pos)) << "]\n" ); LOGDEB1("Db::clearField: remove posting: [" << it->term << "] pos [" <<
it->pos << "]\n");
XAPTRY(xdoc.remove_posting(it->term, it->pos, wdfdec);, XAPTRY(xdoc.remove_posting(it->term, it->pos, wdfdec);,
xwdb,m_rcldb->m_reason); xwdb,m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
// Not that this normally fails for non-prefixed XXST and // Not that this normally fails for non-prefixed XXST and
// ND, don't make a fuss // ND, don't make a fuss
LOGDEB1("Db::clearFiedl: remove_posting failed for [" << (it->term) << "]," << (int(it->pos)) << ": " << (m_rcldb->m_reason) << "\n" ); LOGDEB1("Db::clearFiedl: remove_posting failed for [" << it->term <<
"]," << it->pos << ": " << m_rcldb->m_reason << "\n");
} }
clearDocTermIfWdf0(xdoc, it->term); clearDocTermIfWdf0(xdoc, it->term);
} }
@ -382,7 +391,7 @@ bool Db::Native::clearField(Xapian::Document& xdoc, const string& pfx,
// Check if doc given by udi is indexed by term // Check if doc given by udi is indexed by term
bool Db::Native::hasTerm(const string& udi, int idxi, const string& term) bool Db::Native::hasTerm(const string& udi, int idxi, const string& term)
{ {
LOGDEB2("Native::hasTerm: udi [" << (udi) << "] term [" << (term) << "]\n" ); LOGDEB2("Native::hasTerm: udi [" << udi << "] term [" << term << "]\n");
Xapian::Document xdoc; Xapian::Document xdoc;
if (getDoc(udi, idxi, xdoc)) { if (getDoc(udi, idxi, xdoc)) {
Xapian::TermIterator xit; Xapian::TermIterator xit;
@ -390,7 +399,7 @@ bool Db::Native::hasTerm(const string& udi, int idxi, const string& term)
xit.skip_to(term);, xit.skip_to(term);,
xrdb, m_rcldb->m_reason); xrdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("Rcl::Native::hasTerm: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Rcl::Native::hasTerm: " << m_rcldb->m_reason << "\n");
return false; return false;
} }
if (xit != xdoc.termlist_end() && !term.compare(*xit)) { if (xit != xdoc.termlist_end() && !term.compare(*xit)) {
@ -424,7 +433,7 @@ Xapian::docid Db::Native::getDoc(const string& udi, int idxi,
} XCATCHERROR(m_rcldb->m_reason); } XCATCHERROR(m_rcldb->m_reason);
break; break;
} }
LOGERR("Db::Native::getDoc: Xapian error: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Db::Native::getDoc: Xapian error: " << m_rcldb->m_reason << "\n");
return 0; return 0;
} }
@ -432,7 +441,7 @@ Xapian::docid Db::Native::getDoc(const string& udi, int idxi,
bool Db::Native::dbDataToRclDoc(Xapian::docid docid, std::string &data, bool Db::Native::dbDataToRclDoc(Xapian::docid docid, std::string &data,
Doc &doc) Doc &doc)
{ {
LOGDEB2("Db::dbDataToRclDoc: data:\n" << (data) << "\n" ); LOGDEB2("Db::dbDataToRclDoc: data:\n" << data << "\n");
ConfSimple parms(data); ConfSimple parms(data);
if (!parms.ok()) if (!parms.ok())
return false; return false;
@ -503,7 +512,7 @@ bool Db::Native::hasPages(Xapian::docid docid)
}, },
xrdb, ermsg); xrdb, ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::Native::hasPages: xapian error: " << (ermsg) << "\n" ); LOGERR("Db::Native::hasPages: xapian error: " << ermsg << "\n");
} }
return false; return false;
} }
@ -540,13 +549,15 @@ bool Db::Native::getPagePositions(Xapian::docid docid, vector<int>& vpos)
pos != xrdb.positionlist_end(docid, qterm); pos++) { pos != xrdb.positionlist_end(docid, qterm); pos++) {
int ipos = *pos; int ipos = *pos;
if (ipos < int(baseTextPosition)) { if (ipos < int(baseTextPosition)) {
LOGDEB("getPagePositions: got page position " << (ipos) << " not in body\n" ); LOGDEB("getPagePositions: got page position " << ipos
<< " not in body\n");
// Not in text body. Strange... // Not in text body. Strange...
continue; continue;
} }
map<int, int>::iterator it = mbreaksmap.find(ipos); map<int, int>::iterator it = mbreaksmap.find(ipos);
if (it != mbreaksmap.end()) { if (it != mbreaksmap.end()) {
LOGDEB1("getPagePositions: found multibreak at " << (ipos) << " incr " << (it->second) << "\n" ); LOGDEB1("getPagePositions: found multibreak at " << ipos <<
" incr " << it->second << "\n");
for (int i = 0 ; i < it->second; i++) for (int i = 0 ; i < it->second; i++)
vpos.push_back(ipos); vpos.push_back(ipos);
} }
@ -609,22 +620,23 @@ bool Db::Native::addOrUpdateWrite(const string& udi, const string& uniterm,
// by needUpdate(), so the subdocs existence flags are only set // by needUpdate(), so the subdocs existence flags are only set
// here. // here.
m_rcldb->updated[did] = true; m_rcldb->updated[did] = true;
LOGINFO("Db::add: docid " << (did) << " updated [" << (fnc) << "]\n" ); LOGINFO("Db::add: docid " << did << " updated [" << fnc << "]\n");
} else { } else {
LOGINFO("Db::add: docid " << (did) << " added [" << (fnc) << "]\n" ); LOGINFO("Db::add: docid " << did << " added [" << fnc << "]\n");
} }
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::add: replace_document failed: " << (ermsg) << "\n" ); LOGERR("Db::add: replace_document failed: " << ermsg << "\n");
ermsg.erase(); ermsg.erase();
// FIXME: is this ever actually needed? // FIXME: is this ever actually needed?
try { try {
xwdb.add_document(*newdocument_ptr); xwdb.add_document(*newdocument_ptr);
LOGDEB("Db::add: " << (fnc) << " added (failed re-seek for duplicate)\n" ); LOGDEB("Db::add: " << fnc <<
" added (failed re-seek for duplicate)\n");
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::add: add_document failed: " << (ermsg) << "\n" ); LOGERR("Db::add: add_document failed: " << ermsg << "\n");
return false; return false;
} }
} }
@ -667,12 +679,12 @@ bool Db::Native::purgeFileWrite(bool orphansOnly, const string& udi,
return false; return false;
} }
} else { } else {
LOGDEB("purgeFile: delete docid " << (*docid) << "\n" ); LOGDEB("purgeFile: delete docid " << *docid << "\n");
xwdb.delete_document(*docid); xwdb.delete_document(*docid);
} }
vector<Xapian::docid> docids; vector<Xapian::docid> docids;
subDocs(udi, 0, docids); subDocs(udi, 0, docids);
LOGDEB("purgeFile: subdocs cnt " << (docids.size()) << "\n" ); LOGDEB("purgeFile: subdocs cnt " << docids.size() << "\n");
for (vector<Xapian::docid>::iterator it = docids.begin(); for (vector<Xapian::docid>::iterator it = docids.begin();
it != docids.end(); it++) { it != docids.end(); it++) {
if (m_rcldb->m_flushMb > 0) { if (m_rcldb->m_flushMb > 0) {
@ -690,14 +702,14 @@ bool Db::Native::purgeFileWrite(bool orphansOnly, const string& udi,
} }
if (!orphansOnly || sig != subdocsig) { if (!orphansOnly || sig != subdocsig) {
LOGDEB("Db::purgeFile: delete subdoc " << (*it) << "\n" ); LOGDEB("Db::purgeFile: delete subdoc " << *it << "\n");
xwdb.delete_document(*it); xwdb.delete_document(*it);
} }
} }
return true; return true;
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::purgeFileWrite: " << (ermsg) << "\n" ); LOGERR("Db::purgeFileWrite: " << ermsg << "\n");
} }
return false; return false;
} }
@ -760,7 +772,8 @@ bool Db::open(OpenMode mode, OpenError *error)
m_reason = "Null configuration or Xapian Db"; m_reason = "Null configuration or Xapian Db";
return false; return false;
} }
LOGDEB("Db::open: m_isopen " << (m_ndb->m_isopen) << " m_iswritable " << (m_ndb->m_iswritable) << " mode " << (mode) << "\n" ); LOGDEB("Db::open: m_isopen " << m_ndb->m_isopen << " m_iswritable " <<
m_ndb->m_iswritable << " mode " << mode << "\n");
if (m_ndb->m_isopen) { if (m_ndb->m_isopen) {
// We used to return an error here but I see no reason to // We used to return an error here but I see no reason to
@ -798,7 +811,8 @@ bool Db::open(OpenMode mode, OpenError *error)
// trigger other Xapian issues, so the query db is now // trigger other Xapian issues, so the query db is now
// a clone of the update one. // a clone of the update one.
m_ndb->xrdb = m_ndb->xwdb; m_ndb->xrdb = m_ndb->xwdb;
LOGDEB("Db::open: lastdocid: " << (m_ndb->xwdb.get_lastdocid()) << "\n" ); LOGDEB("Db::open: lastdocid: " << m_ndb->xwdb.get_lastdocid() <<
"\n");
LOGDEB2("Db::open: resetting updated\n"); LOGDEB2("Db::open: resetting updated\n");
updated.resize(m_ndb->xwdb.get_lastdocid() + 1); updated.resize(m_ndb->xwdb.get_lastdocid() + 1);
for (unsigned int i = 0; i < updated.size(); i++) for (unsigned int i = 0; i < updated.size(); i++)
@ -829,7 +843,8 @@ bool Db::open(OpenMode mode, OpenError *error)
string version = m_ndb->xrdb.get_metadata(cstr_RCL_IDX_VERSION_KEY); string version = m_ndb->xrdb.get_metadata(cstr_RCL_IDX_VERSION_KEY);
if (version.compare(cstr_RCL_IDX_VERSION)) { if (version.compare(cstr_RCL_IDX_VERSION)) {
m_ndb->m_noversionwrite = true; m_ndb->m_noversionwrite = true;
LOGERR("Rcl::Db::open: file index [" << (version) << "], software [" << (cstr_RCL_IDX_VERSION) << "]\n" ); LOGERR("Rcl::Db::open: file index [" << version <<
"], software [" << cstr_RCL_IDX_VERSION << "]\n");
throw Xapian::DatabaseError("Recoll index version mismatch", throw Xapian::DatabaseError("Recoll index version mismatch",
"", ""); "", "");
} }
@ -843,7 +858,7 @@ bool Db::open(OpenMode mode, OpenError *error)
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
m_reason = ermsg; m_reason = ermsg;
LOGERR("Db::open: exception while opening [" << (dir) << "]: " << (ermsg) << "\n" ); LOGERR("Db::open: exception while opening [" <<dir<< "]: " << ermsg << "\n");
return false; return false;
} }
@ -857,7 +872,8 @@ bool Db::i_close(bool final)
{ {
if (m_ndb == 0) if (m_ndb == 0)
return false; return false;
LOGDEB("Db::i_close(" << (final) << "): m_isopen " << (m_ndb->m_isopen) << " m_iswritable " << (m_ndb->m_iswritable) << "\n" ); LOGDEB("Db::i_close(" << final << "): m_isopen " << m_ndb->m_isopen <<
" m_iswritable " << m_ndb->m_iswritable << "\n");
if (m_ndb->m_isopen == false && !final) if (m_ndb->m_isopen == false && !final)
return true; return true;
@ -886,7 +902,7 @@ bool Db::i_close(bool final)
LOGERR("Rcl::Db::close(): cant recreate db object\n"); LOGERR("Rcl::Db::close(): cant recreate db object\n");
return false; return false;
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
LOGERR("Db:close: exception while deleting db: " << (ermsg) << "\n" ); LOGERR("Db:close: exception while deleting db: " << ermsg << "\n");
return false; return false;
} }
@ -916,7 +932,7 @@ int Db::docCnt()
XAPTRY(res = m_ndb->xrdb.get_doccount(), m_ndb->xrdb, m_reason); XAPTRY(res = m_ndb->xrdb.get_doccount(), m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::docCnt: got error: " << (m_reason) << "\n" ); LOGERR("Db::docCnt: got error: " << m_reason << "\n");
return -1; return -1;
} }
return res; return res;
@ -931,19 +947,19 @@ int Db::termDocCnt(const string& _term)
string term = _term; string term = _term;
if (o_index_stripchars) if (o_index_stripchars)
if (!unacmaybefold(_term, term, "UTF-8", UNACOP_UNACFOLD)) { if (!unacmaybefold(_term, term, "UTF-8", UNACOP_UNACFOLD)) {
LOGINFO("Db::termDocCnt: unac failed for [" << (_term) << "]\n" ); LOGINFO("Db::termDocCnt: unac failed for [" << _term << "]\n");
return 0; return 0;
} }
if (m_stops.isStop(term)) { if (m_stops.isStop(term)) {
LOGDEB1("Db::termDocCnt [" << (term) << "] in stop list\n" ); LOGDEB1("Db::termDocCnt [" << term << "] in stop list\n");
return 0; return 0;
} }
XAPTRY(res = m_ndb->xrdb.get_termfreq(term), m_ndb->xrdb, m_reason); XAPTRY(res = m_ndb->xrdb.get_termfreq(term), m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::termDocCnt: got error: " << (m_reason) << "\n" ); LOGERR("Db::termDocCnt: got error: " << m_reason << "\n");
return -1; return -1;
} }
return res; return res;
@ -952,7 +968,8 @@ int Db::termDocCnt(const string& _term)
bool Db::addQueryDb(const string &_dir) bool Db::addQueryDb(const string &_dir)
{ {
string dir = _dir; string dir = _dir;
LOGDEB0("Db::addQueryDb: ndb " << (m_ndb) << " iswritable " << ((m_ndb)?m_ndb->m_iswritable:0) << " db [" << (dir) << "]\n" ); LOGDEB0("Db::addQueryDb: ndb " << m_ndb << " iswritable " <<
((m_ndb)?m_ndb->m_iswritable:0) << " db [" << dir << "]\n");
if (!m_ndb) if (!m_ndb)
return false; return false;
if (m_ndb->m_iswritable) if (m_ndb->m_iswritable)
@ -992,8 +1009,8 @@ size_t Db::whatDbIdx(const Doc& doc)
size_t Db::Native::whatDbIdx(Xapian::docid id) size_t Db::Native::whatDbIdx(Xapian::docid id)
{ {
LOGDEB1("Db::whatDbIdx: xdocid " << ((unsigned long)id) << ", " << LOGDEB1("Db::whatDbIdx: xdocid " << id << ", " <<
(m_rcldb->m_extraDbs.size()) << " extraDbs\n" ); m_rcldb->m_extraDbs.size() << " extraDbs\n");
if (id == 0) if (id == 0)
return (size_t)-1; return (size_t)-1;
if (m_rcldb->m_extraDbs.size() == 0) if (m_rcldb->m_extraDbs.size() == 0)
@ -1005,7 +1022,7 @@ bool Db::testDbDir(const string &dir, bool *stripped_p)
{ {
string aerr; string aerr;
bool mstripped = true; bool mstripped = true;
LOGDEB("Db::testDbDir: [" << (dir) << "]\n" ); LOGDEB("Db::testDbDir: [" << dir << "]\n");
try { try {
Xapian::Database db(dir); Xapian::Database db(dir);
// If we have terms with a leading ':' it's an // If we have terms with a leading ':' it's an
@ -1017,7 +1034,8 @@ bool Db::testDbDir(const string &dir, bool *stripped_p)
mstripped = false; mstripped = false;
} XCATCHERROR(aerr); } XCATCHERROR(aerr);
if (!aerr.empty()) { if (!aerr.empty()) {
LOGERR("Db::Open: error while trying to open database from [" << (dir) << "]: " << (aerr) << "\n" ); LOGERR("Db::Open: error while trying to open database from [" <<
dir << "]: " << aerr << "\n");
return false; return false;
} }
if (stripped_p) if (stripped_p)
@ -1078,7 +1096,7 @@ class TextSplitDb : public TextSplitP {
++basepos; ++basepos;
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db: xapian add_posting error " << (ermsg) << "\n" ); LOGERR("Db: xapian add_posting error " << ermsg << "\n");
goto out; goto out;
} }
@ -1094,7 +1112,7 @@ class TextSplitDb : public TextSplitP {
++basepos; ++basepos;
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db: xapian add_posting error " << (ermsg) << "\n" ); LOGERR("Db: xapian add_posting error " << ermsg << "\n");
goto out; goto out;
} }
@ -1150,27 +1168,30 @@ public:
} }
return true; return true;
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
LOGERR("Db: xapian add_posting error " << (ermsg) << "\n" ); LOGERR("Db: xapian add_posting error " << ermsg << "\n");
return false; return false;
} }
void newpage(int pos) void newpage(int pos)
{ {
pos += m_ts->basepos; pos += m_ts->basepos;
if (pos < int(baseTextPosition)) { if (pos < int(baseTextPosition)) {
LOGDEB("newpage: not in body: " << (pos) << "\n" ); LOGDEB("newpage: not in body: " << pos << "\n");
return; return;
} }
m_ts->doc.add_posting(m_ts->ft.pfx + page_break_term, pos); m_ts->doc.add_posting(m_ts->ft.pfx + page_break_term, pos);
if (pos == m_lastpagepos) { if (pos == m_lastpagepos) {
m_pageincr++; m_pageincr++;
LOGDEB2("newpage: same pos, pageincr " << (m_pageincr) << " lastpagepos " << (m_lastpagepos) << "\n" ); LOGDEB2("newpage: same pos, pageincr " << m_pageincr <<
" lastpagepos " << m_lastpagepos << "\n");
} else { } else {
LOGDEB2("newpage: pos change, pageincr " << (m_pageincr) << " lastpagepos " << (m_lastpagepos) << "\n" ); LOGDEB2("newpage: pos change, pageincr " << m_pageincr <<
" lastpagepos " << m_lastpagepos << "\n");
if (m_pageincr > 0) { if (m_pageincr > 0) {
// Remember the multiple page break at this position // Remember the multiple page break at this position
unsigned int relpos = m_lastpagepos - baseTextPosition; unsigned int relpos = m_lastpagepos - baseTextPosition;
LOGDEB2("Remembering multiple page break. Relpos " << (relpos) << " cnt " << (m_pageincr) << "\n" ); LOGDEB2("Remembering multiple page break. Relpos " << relpos <<
" cnt " << m_pageincr << "\n");
m_pageincrvec.push_back(pair<int, int>(relpos, m_pageincr)); m_pageincrvec.push_back(pair<int, int>(relpos, m_pageincr));
} }
m_pageincr = 0; m_pageincr = 0;
@ -1182,7 +1203,8 @@ public:
{ {
if (m_pageincr > 0) { if (m_pageincr > 0) {
unsigned int relpos = m_lastpagepos - baseTextPosition; unsigned int relpos = m_lastpagepos - baseTextPosition;
LOGDEB2("Remembering multiple page break. Position " << (relpos) << " cnt " << (m_pageincr) << "\n" ); LOGDEB2("Remembering multiple page break. Position " << relpos <<
" cnt " << m_pageincr << "\n");
m_pageincrvec.push_back(pair<int, int>(relpos, m_pageincr)); m_pageincrvec.push_back(pair<int, int>(relpos, m_pageincr));
m_pageincr = 0; m_pageincr = 0;
} }
@ -1225,7 +1247,7 @@ bool Db::getSpellingSuggestions(const string& word, vector<string>& suggs)
string reason; string reason;
m_aspell->init(reason); m_aspell->init(reason);
if (!m_aspell->ok()) { if (!m_aspell->ok()) {
LOGDEB(("Aspell speller init failed %s\n", reason.c_str())); LOGDEB("Aspell speller init failed: " << reason << endl);
delete m_aspell; delete m_aspell;
m_aspell = 0; m_aspell = 0;
} }
@ -1395,13 +1417,18 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi, Doc &doc)
// We don't test for an empty prefix here. Some fields are part // We don't test for an empty prefix here. Some fields are part
// of the internal conf with an empty prefix (ie: abstract). // of the internal conf with an empty prefix (ie: abstract).
if (!fieldToTraits(meta_it->first, &ftp)) { if (!fieldToTraits(meta_it->first, &ftp)) {
LOGDEB0("Db::add: no prefix for field [" << (meta_it->first) << "], no indexing\n" ); LOGDEB0("Db::add: no prefix for field [" <<
meta_it->first << "], no indexing\n");
continue; continue;
} }
LOGDEB0("Db::add: field [" << (meta_it->first) << "] pfx [" << (ftp->pfx) << "] inc " << (ftp->wdfinc) << ": [" << (meta_it->second) << "]\n" ); LOGDEB0("Db::add: field [" << meta_it->first << "] pfx [" <<
ftp->pfx << "] inc " << ftp->wdfinc << ": [" <<
meta_it->second << "]\n");
splitter.setTraits(*ftp); splitter.setTraits(*ftp);
if (!splitter.text_to_words(meta_it->second)) if (!splitter.text_to_words(meta_it->second)) {
LOGDEB("Db::addOrUpdate: split failed for " << (meta_it->first) << "\n" ); LOGDEB("Db::addOrUpdate: split failed for " <<
meta_it->first << "\n");
}
} }
} }
@ -1412,7 +1439,7 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi, Doc &doc)
splitter.basepos = baseTextPosition; splitter.basepos = baseTextPosition;
// Split and index body text // Split and index body text
LOGDEB2("Db::add: split body: [" << (doc.text) << "]\n" ); LOGDEB2("Db::add: split body: [" << doc.text << "]\n");
#ifdef TEXTSPLIT_STATS #ifdef TEXTSPLIT_STATS
splitter.resetStats(); splitter.resetStats();
@ -1427,7 +1454,10 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi, Doc &doc)
TextSplit::Stats::Values v = splitter.getStats(); TextSplit::Stats::Values v = splitter.getStats();
// v.avglen > 15 && v.sigma > 12 // v.avglen > 15 && v.sigma > 12
if (v.count > 200 && (v.avglen > 10 && v.sigma / v.avglen > 0.8)) { if (v.count > 200 && (v.avglen > 10 && v.sigma / v.avglen > 0.8)) {
LOGINFO("RclDb::addOrUpdate: rejecting doc for bad stats count " << (v.count) << " avglen " << (v.avglen) << " sigma " << (v.sigma) << " url [" << (doc.url) << "] ipath [" << (doc.ipath) << "] text " << (doc.text) << "\n" ); LOGINFO("RclDb::addOrUpdate: rejecting doc for bad stats count " <<
v.count << " avglen " << v.avglen << " sigma " << v.sigma <<
" url [" << doc.url << "] ipath [" << doc.ipath <<
"] text " << doc.text << "\n");
delete newdocument_ptr; delete newdocument_ptr;
return true; return true;
} }
@ -1626,7 +1656,7 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi, Doc &doc)
newdocument.add_boolean_term(wrap_prefix("XM") + *md5); newdocument.add_boolean_term(wrap_prefix("XM") + *md5);
} }
LOGDEB0("Rcl::Db::add: new doc record:\n" << (record) << "\n" ); LOGDEB0("Rcl::Db::add: new doc record:\n" << record << "\n");
newdocument.set_data(record); newdocument.set_data(record);
} }
#ifdef IDX_THREADS #ifdef IDX_THREADS
@ -1663,7 +1693,7 @@ bool Db::Native::docToXdocXattrOnly(TextSplitDb *splitter, const string &udi,
string data; string data;
XAPTRY(data = xdoc.get_data(), xrdb, m_rcldb->m_reason); XAPTRY(data = xdoc.get_data(), xrdb, m_rcldb->m_reason);
if (!m_rcldb->m_reason.empty()) { if (!m_rcldb->m_reason.empty()) {
LOGERR("Db::xattrOnly: got error: " << (m_rcldb->m_reason) << "\n" ); LOGERR("Db::xattrOnly: got error: " << m_rcldb->m_reason << "\n");
return false; return false;
} }
@ -1672,15 +1702,19 @@ bool Db::Native::docToXdocXattrOnly(TextSplitDb *splitter, const string &udi,
for (meta_it = doc.meta.begin(); meta_it != doc.meta.end(); meta_it++) { for (meta_it = doc.meta.begin(); meta_it != doc.meta.end(); meta_it++) {
const FieldTraits *ftp; const FieldTraits *ftp;
if (!m_rcldb->fieldToTraits(meta_it->first, &ftp) || ftp->pfx.empty()) { if (!m_rcldb->fieldToTraits(meta_it->first, &ftp) || ftp->pfx.empty()) {
LOGDEB0("Db::xattrOnly: no prefix for field [" << (meta_it->first) << "], skipped\n" ); LOGDEB0("Db::xattrOnly: no prefix for field [" <<
meta_it->first << "], skipped\n");
continue; continue;
} }
// Clear the previous terms for the field // Clear the previous terms for the field
clearField(xdoc, ftp->pfx, ftp->wdfinc); clearField(xdoc, ftp->pfx, ftp->wdfinc);
LOGDEB0("Db::xattrOnly: field [" << (meta_it->first) << "] pfx [" << (ftp->pfx) << "] inc " << (ftp->wdfinc) << ": [" << (meta_it->second) << "]\n" ); LOGDEB0("Db::xattrOnly: field [" << meta_it->first << "] pfx [" <<
ftp->pfx << "] inc " << ftp->wdfinc << ": [" <<
meta_it->second << "]\n");
splitter->setTraits(*ftp); splitter->setTraits(*ftp);
if (!splitter->text_to_words(meta_it->second)) if (!splitter->text_to_words(meta_it->second)) {
LOGDEB("Db::xattrOnly: split failed for " << (meta_it->first) << "\n" ); LOGDEB("Db::xattrOnly: split failed for " << meta_it->first << "\n");
}
} }
xdoc.add_value(VALUE_SIG, doc.sig); xdoc.add_value(VALUE_SIG, doc.sig);
@ -1732,10 +1766,11 @@ void Db::waitUpdIdle()
m_ndb->xwdb.commit(); m_ndb->xwdb.commit();
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::waitUpdIdle: flush() failed: " << (ermsg) << "\n" ); LOGERR("Db::waitUpdIdle: flush() failed: " << ermsg << "\n");
} }
m_ndb->m_totalworkns += chron.nanos(); m_ndb->m_totalworkns += chron.nanos();
LOGINFO("Db::waitUpdIdle: total xapian work " << (lltodecstr(m_ndb->m_totalworkns/1000000)) << " mS\n" ); LOGINFO("Db::waitUpdIdle: total xapian work " <<
lltodecstr(m_ndb->m_totalworkns/1000000) << " mS\n");
} }
} }
#endif #endif
@ -1746,7 +1781,8 @@ bool Db::maybeflush(int64_t moretext)
if (m_flushMb > 0) { if (m_flushMb > 0) {
m_curtxtsz += moretext; m_curtxtsz += moretext;
if ((m_curtxtsz - m_flushtxtsz) / MB >= m_flushMb) { if ((m_curtxtsz - m_flushtxtsz) / MB >= m_flushMb) {
LOGDEB("Db::add/delete: txt size >= " << (m_flushMb) << " Mb, flushing\n" ); LOGDEB("Db::add/delete: txt size >= " << m_flushMb <<
" Mb, flushing\n");
return doFlush(); return doFlush();
} }
} }
@ -1764,7 +1800,7 @@ bool Db::doFlush()
m_ndb->xwdb.commit(); m_ndb->xwdb.commit();
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::doFlush: flush() failed: " << (ermsg) << "\n" ); LOGERR("Db::doFlush: flush() failed: " << ermsg << "\n");
return false; return false;
} }
m_flushtxtsz = m_curtxtsz; m_flushtxtsz = m_curtxtsz;
@ -1789,7 +1825,9 @@ void Db::i_setExistingFlags(const string& udi, unsigned int docid)
{ {
// Set the up to date flag for the document and its subdocs // Set the up to date flag for the document and its subdocs
if (docid >= updated.size()) { if (docid >= updated.size()) {
LOGERR("needUpdate: existing docid beyond updated.size(). Udi [" << (udi) << "], docid " << (unsigned(docid)) << ", updated.size() " << ((unsigned)updated.size()) << "\n" ); LOGERR("needUpdate: existing docid beyond updated.size(). Udi [" <<
udi << "], docid " << docid << ", updated.size() " <<
updated.size() << "\n");
return; return;
} else { } else {
updated[docid] = true; updated[docid] = true;
@ -1847,18 +1885,19 @@ bool Db::needUpdate(const string &udi, const string& sig,
Xapian::PostingIterator docid; Xapian::PostingIterator docid;
XAPTRY(docid = m_ndb->xrdb.postlist_begin(uniterm), m_ndb->xrdb, m_reason); XAPTRY(docid = m_ndb->xrdb.postlist_begin(uniterm), m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::needUpdate: xapian::postlist_begin failed: " << (m_reason) << "\n" ); LOGERR("Db::needUpdate: xapian::postlist_begin failed: " <<
m_reason << "\n");
return false; return false;
} }
if (docid == m_ndb->xrdb.postlist_end(uniterm)) { if (docid == m_ndb->xrdb.postlist_end(uniterm)) {
// No document exists with this path: we do need update // No document exists with this path: we do need update
LOGDEB("Db::needUpdate:yes (new): [" << (uniterm) << "]\n" ); LOGDEB("Db::needUpdate:yes (new): [" << uniterm << "]\n");
return true; return true;
} }
Xapian::Document xdoc; Xapian::Document xdoc;
XAPTRY(xdoc = m_ndb->xrdb.get_document(*docid), m_ndb->xrdb, m_reason); XAPTRY(xdoc = m_ndb->xrdb.get_document(*docid), m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::needUpdate: get_document error: " << (m_reason) << "\n" ); LOGERR("Db::needUpdate: get_document error: " << m_reason << "\n");
return true; return true;
} }
@ -1870,10 +1909,10 @@ bool Db::needUpdate(const string &udi, const string& sig,
string osig; string osig;
XAPTRY(osig = xdoc.get_value(VALUE_SIG), m_ndb->xrdb, m_reason); XAPTRY(osig = xdoc.get_value(VALUE_SIG), m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::needUpdate: get_value error: " << (m_reason) << "\n" ); LOGERR("Db::needUpdate: get_value error: " << m_reason << "\n");
return true; return true;
} }
LOGDEB2("Db::needUpdate: oldsig [" << (osig) << "] new [" << (sig) << "]\n" ); LOGDEB2("Db::needUpdate: oldsig [" << osig << "] new [" << sig << "]\n");
if (osigp) { if (osigp) {
*osigp = osig; *osigp = osig;
@ -1881,14 +1920,15 @@ bool Db::needUpdate(const string &udi, const string& sig,
// Compare new/old sig // Compare new/old sig
if (sig != osig) { if (sig != osig) {
LOGDEB("Db::needUpdate:yes: olsig [" << (osig) << "] new [" << (sig) << "] [" << (uniterm) << "]\n" ); LOGDEB("Db::needUpdate:yes: olsig [" << osig << "] new [" << sig <<
"] [" << uniterm << "]\n");
// Db is not up to date. Let's index the file // Db is not up to date. Let's index the file
return true; return true;
} }
// Up to date. Set the existance flags in the map for the doc and // Up to date. Set the existance flags in the map for the doc and
// its subdocs. // its subdocs.
LOGDEB("Db::needUpdate:no: [" << (uniterm) << "]\n" ); LOGDEB("Db::needUpdate:no: [" << uniterm << "]\n");
i_setExistingFlags(udi, *docid); i_setExistingFlags(udi, *docid);
return false; return false;
} }
@ -1910,7 +1950,7 @@ vector<string> Db::getStemLangs()
*/ */
bool Db::deleteStemDb(const string& lang) bool Db::deleteStemDb(const string& lang)
{ {
LOGDEB("Db::deleteStemDb(" << (lang) << ")\n" ); LOGDEB("Db::deleteStemDb(" << lang << ")\n");
if (m_ndb == 0 || m_ndb->m_isopen == false || !m_ndb->m_iswritable) if (m_ndb == 0 || m_ndb->m_isopen == false || !m_ndb->m_iswritable)
return false; return false;
XapWritableSynFamily db(m_ndb->xwdb, synFamStem); XapWritableSynFamily db(m_ndb->xwdb, synFamStem);
@ -1945,7 +1985,8 @@ bool Db::purge()
LOGDEB("Db::purge\n"); LOGDEB("Db::purge\n");
if (m_ndb == 0) if (m_ndb == 0)
return false; return false;
LOGDEB("Db::purge: m_isopen " << (m_ndb->m_isopen) << " m_iswritable " << (m_ndb->m_iswritable) << "\n" ); LOGDEB("Db::purge: m_isopen " << m_ndb->m_isopen << " m_iswritable " <<
m_ndb->m_iswritable << "\n");
if (m_ndb->m_isopen == false || m_ndb->m_iswritable == false) if (m_ndb->m_isopen == false || m_ndb->m_iswritable == false)
return false; return false;
@ -1998,13 +2039,14 @@ bool Db::purge()
maybeflush(trms * 5); maybeflush(trms * 5);
} }
m_ndb->xwdb.delete_document(docid); m_ndb->xwdb.delete_document(docid);
LOGDEB("Db::purge: deleted document #" << (docid) << "\n" ); LOGDEB("Db::purge: deleted document #" << docid << "\n");
} catch (const Xapian::DocNotFoundError &) { } catch (const Xapian::DocNotFoundError &) {
LOGDEB0("Db::purge: document #" << (docid) << " not found\n" ); LOGDEB0("Db::purge: document #" << docid << " not found\n");
} catch (const Xapian::Error &e) { } catch (const Xapian::Error &e) {
LOGERR("Db::purge: document #" << (docid) << ": " << (e.get_msg()) << "\n" ); LOGERR("Db::purge: document #" << docid << ": " <<
e.get_msg() << "\n");
} catch (...) { } catch (...) {
LOGERR("Db::purge: document #" << (docid) << ": unknown error\n" ); LOGERR("Db::purge: document #" << docid << ": unknown error\n");
} }
purgecount++; purgecount++;
} }
@ -2036,7 +2078,7 @@ bool Db::docExists(const string& uniterm)
} }
} XCATCHERROR(ermsg); } XCATCHERROR(ermsg);
if (!ermsg.empty()) { if (!ermsg.empty()) {
LOGERR("Db::docExists(" << (uniterm) << ") " << (ermsg) << "\n" ); LOGERR("Db::docExists(" << uniterm << ") " << ermsg << "\n");
} }
return false; return false;
} }
@ -2044,7 +2086,7 @@ bool Db::docExists(const string& uniterm)
/* Delete document(s) for given unique identifier (doc and descendents) */ /* Delete document(s) for given unique identifier (doc and descendents) */
bool Db::purgeFile(const string &udi, bool *existed) bool Db::purgeFile(const string &udi, bool *existed)
{ {
LOGDEB("Db:purgeFile: [" << (udi) << "]\n" ); LOGDEB("Db:purgeFile: [" << udi << "]\n");
if (m_ndb == 0 || !m_ndb->m_iswritable) if (m_ndb == 0 || !m_ndb->m_iswritable)
return false; return false;
@ -2076,7 +2118,7 @@ bool Db::purgeFile(const string &udi, bool *existed)
will be done */ will be done */
bool Db::purgeOrphans(const string &udi) bool Db::purgeOrphans(const string &udi)
{ {
LOGDEB("Db:purgeOrphans: [" << (udi) << "]\n" ); LOGDEB("Db:purgeOrphans: [" << udi << "]\n");
if (m_ndb == 0 || !m_ndb->m_iswritable) if (m_ndb == 0 || !m_ndb->m_iswritable)
return false; return false;
@ -2120,7 +2162,7 @@ bool Db::dbStats(DbStats& res)
// existence should be tested by looking at doc.pc // existence should be tested by looking at doc.pc
bool Db::getDoc(const string &udi, const Doc& idxdoc, Doc &doc) bool Db::getDoc(const string &udi, const Doc& idxdoc, Doc &doc)
{ {
LOGDEB("Db:getDoc: [" << (udi) << "]\n" ); LOGDEB("Db:getDoc: [" << udi << "]\n");
if (m_ndb == 0) if (m_ndb == 0)
return false; return false;
@ -2141,7 +2183,7 @@ bool Db::getDoc(const string &udi, const Doc& idxdoc, Doc &doc)
// other ok docs further) but indicate the error with // other ok docs further) but indicate the error with
// pc = -1 // pc = -1
doc.pc = -1; doc.pc = -1;
LOGINFO("Db:getDoc: no such doc in index: [" << (udi) << "]\n" ); LOGINFO("Db:getDoc: no such doc in index: [" << udi << "]\n");
return true; return true;
} }
} }
@ -2155,7 +2197,7 @@ bool Db::hasSubDocs(const Doc &idoc)
LOGERR("Db::hasSubDocs: no input udi or empty\n"); LOGERR("Db::hasSubDocs: no input udi or empty\n");
return false; return false;
} }
LOGDEB1("Db::hasSubDocs: idxi " << (idoc.idxi) << " inudi [" << (inudi) << "]\n" ); LOGDEB1("Db::hasSubDocs: idxi " << idoc.idxi << " inudi [" <<inudi << "]\n");
// Not sure why we perform both the subDocs() call and the test on // Not sure why we perform both the subDocs() call and the test on
// has_children. The former will return docs if the input is a // has_children. The former will return docs if the input is a
@ -2192,7 +2234,8 @@ bool Db::getSubDocs(const Doc &idoc, vector<Doc>& subdocs)
string rootudi; string rootudi;
string ipath = idoc.ipath; string ipath = idoc.ipath;
LOGDEB0("Db::getSubDocs: idxi " << (idoc.idxi) << " inudi [" << (inudi) << "] ipath [" << (ipath) << "]\n" ); LOGDEB0("Db::getSubDocs: idxi " << idoc.idxi << " inudi [" << inudi <<
"] ipath [" << ipath << "]\n");
if (ipath.empty()) { if (ipath.empty()) {
// File-level doc. Use it as root // File-level doc. Use it as root
rootudi = inudi; rootudi = inudi;
@ -2208,7 +2251,7 @@ bool Db::getSubDocs(const Doc &idoc, vector<Doc>& subdocs)
xit.skip_to(wrap_prefix(parent_prefix)), xit.skip_to(wrap_prefix(parent_prefix)),
m_ndb->xrdb, m_reason); m_ndb->xrdb, m_reason);
if (!m_reason.empty()) { if (!m_reason.empty()) {
LOGERR("Db::getSubDocs: xapian error: " << (m_reason) << "\n" ); LOGERR("Db::getSubDocs: xapian error: " << m_reason << "\n");
return false; return false;
} }
if (xit == xdoc.termlist_end()) { if (xit == xdoc.termlist_end()) {
@ -2218,7 +2261,7 @@ bool Db::getSubDocs(const Doc &idoc, vector<Doc>& subdocs)
rootudi = strip_prefix(*xit); rootudi = strip_prefix(*xit);
} }
LOGDEB("Db::getSubDocs: root: [" << (rootudi) << "]\n" ); LOGDEB("Db::getSubDocs: root: [" << rootudi << "]\n");
// Retrieve all subdoc xapian ids for the root // Retrieve all subdoc xapian ids for the root
vector<Xapian::docid> docids; vector<Xapian::docid> docids;
@ -2258,7 +2301,7 @@ bool Db::getSubDocs(const Doc &idoc, vector<Doc>& subdocs)
break; break;
} }
LOGERR("Db::getSubDocs: Xapian error: " << (m_reason) << "\n" ); LOGERR("Db::getSubDocs: Xapian error: " << m_reason << "\n");
return false; return false;
} }