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

Fixed LOG calls obsolescence issues preventing build with staticverbosity 7

Browse Source
This commit is contained in:
Jean-Francois Dockes 2020-09-06 14:59:00 +01:00
parent dbc77b3129
commit c1ef2187d3
11 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/rclconfig.cpp
View File

@ -1161,7 +1161,7 @@ set<string> RclConfig::getMimeViewerAllEx() const
string base, plus, minus;
mimeview->get("xallexcepts", base, "");
LOGDEB1("RclConfig::getMimeViewerAllEx(): base: " << s << endl);
LOGDEB1("RclConfig::getMimeViewerAllEx(): base: " << base << endl);
mimeview->get("xallexcepts+", plus, "");
LOGDEB1("RclConfig::getMimeViewerAllEx(): plus: " << plus << endl);
mimeview->get("xallexcepts-", minus, "");

6
src/common/textsplitko.cpp
View File

@ -268,12 +268,6 @@ bool TextSplit::ko_to_words(Utf8Iter *itp, unsigned int *cp)
}
STRSZT abspos = orgbytepos + bytepos - pagefix;
LOGDEB1("WORD [" << word << "] size " << word.size() <<
" TAG " << tags[i] << " inputdata size " << inputdata.size() <<
" absbytepos " << orgbytepos + bytepos <<
" bytepos " << bytepos << " word from text: " <<
inputdata.substr(bytepos, word.size()) << endl);
// See if we are at a span start position, emit a span if we are.
auto it = std::find_if(spans.begin(), spans.end(),
[bytepos] (const std::pair<STRSZT, STRSZT>& e){

4
src/index/fsindexer.cpp
View File

@ -270,7 +270,7 @@ static bool matchesSkipped(const vector<string>& tdl,
it != tdl.end(); it++) {
// the topdirs members are already canonized.
LOGDEB2("matchesSkipped: comparing ancestor [" << mpath <<
"] to topdir [" << it << "]\n");
"] to topdir [" << *it << "]\n");
if (!mpath.compare(*it)) {
topdir = *it;
goto goodpath;
@ -350,7 +350,7 @@ bool FsIndexer::indexFiles(list<string>& files, int flags)
walker.setSkippedPaths(m_config->getSkippedPaths());
for (list<string>::iterator it = files.begin(); it != files.end(); ) {
LOGDEB2("FsIndexer::indexFiles: [" << it << "]\n");
LOGDEB2("FsIndexer::indexFiles: [" << *it << "]\n");
m_config->setKeyDir(path_getfather(*it));
if (m_havelocalfields)

2
src/internfile/mh_execm.cpp
View File

@ -151,7 +151,7 @@ bool MimeHandlerExecMultiple::readDataElement(string& name, string &data)
}
LOGDEB1("MHExecMe:rdDtElt got: name [" << name << "] len " << len <<
"value [" << (datap->size() > 100 ?
(datap->substr(0, 100) + " ...") : datap) << endl);
(datap->substr(0, 100) + " ...") : *datap) << endl);
return true;
}

2
src/internfile/mh_mbox.cpp
View File

@ -211,8 +211,6 @@ public:
}
for (const auto& off : offs) {
LOGDEB1("MboxCache::put_offsets: writing value " << off <<
" at offset " << ftello(fp) << endl);
os.write((char*)&off, sizeof(int64_t));
if (!os.good()) {
LOGSYSERR("MboxCache::put_offsets", "write", "");

12
src/internfile/mimehandler.cpp
View File

@ -154,23 +154,23 @@ static RecollFilter *mhFactory(RclConfig *config, const string &mimeOrParams,
string lmime(lparams[0]);
stringtolower(lmime);
if (cstr_textplain == lmime) {
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerText\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerText\n");
MD5String("MimeHandlerText", id);
return nobuild ? 0 : new MimeHandlerText(config, id);
} else if (cstr_texthtml == lmime) {
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerHtml\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerHtml\n");
MD5String("MimeHandlerHtml", id);
return nobuild ? 0 : new MimeHandlerHtml(config, id);
} else if ("text/x-mail" == lmime) {
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerMbox\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerMbox\n");
MD5String("MimeHandlerMbox", id);
return nobuild ? 0 : new MimeHandlerMbox(config, id);
} else if ("message/rfc822" == lmime) {
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerMail\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerMail\n");
MD5String("MimeHandlerMail", id);
return nobuild ? 0 : new MimeHandlerMail(config, id);
} else if ("inode/symlink" == lmime) {
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerSymlink\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerSymlink\n");
MD5String("MimeHandlerSymlink", id);
return nobuild ? 0 : new MimeHandlerSymlink(config, id);
} else if ("application/x-zerosize" == lmime) {
@ -183,7 +183,7 @@ static RecollFilter *mhFactory(RclConfig *config, const string &mimeOrParams,
// mimeconf, not at random. For programs, for example this
// allows indexing and previewing as text/plain (no filter
// exec) but still opening with a specific editor.
LOGDEB2("mhFactory(" << mime << "): returning MimeHandlerText(x)\n");
LOGDEB2("mhFactory(" << lmime << "): returning MimeHandlerText(x)\n");
MD5String("MimeHandlerText", id);
return nobuild ? 0 : new MimeHandlerText(config, id);
} else if ("xsltproc" == lmime) {

2
src/qtgui/reslist.cpp
View File

@ -178,8 +178,6 @@ bool QtGuiResListPager::append(const string& data)
bool QtGuiResListPager::append(const string& data, int docnum,
const Rcl::Doc&)
{
LOGDEB2("QtGuiReslistPager::appendDoc: blockCount " <<
m_reslist->document()->blockCount() << ", " << data << "\n");
#if defined(USING_WEBKIT) || defined(USING_WEBENGINE)
QString sdoc = QString(
"<div class=\"rclresult\" id=\"%1\" rcldocnum=\"%1\">").arg(docnum);

2
src/query/filtseq.cpp
View File

@ -74,7 +74,7 @@ bool DocSeqFiltered::setFiltSpec(const DocSeqFiltSpec &filtspec)
m_config->getMimeCatTypes(catg, tps);
for (vector<string>::const_iterator it = tps.begin();
it != tps.end(); it++) {
LOGDEB2("Adding mime: [" << (it) << "]\n" );
LOGDEB2("Adding mime: [" << *it << "]\n");
m_spec.orCrit(DocSeqFiltSpec::DSFS_MIMETYPE, *it);
}
}

2
src/rcldb/rcldb.cpp
View File

@ -347,7 +347,7 @@ void Db::Native::openRead(const string& dir)
bool Db::Native::subDocs(const string &udi, int idxi,
vector<Xapian::docid>& docids)
{
LOGDEB2("subDocs: [" << uniterm << "]\n");
LOGDEB2("subDocs: [" << udi << "]\n");
string pterm = make_parentterm(udi);
vector<Xapian::docid> candidates;
XAPTRY(docids.clear();

4
src/utils/transcode.cpp
View File

@ -101,8 +101,8 @@ bool transcode(const string &in, string &out, const string &icode,
#endif
if (errno == EILSEQ) {
LOGDEB1("transcode:iconv: bad input seq.: shift, retry\n");
LOGDEB1(" Input consumed " << ip - in << " output produced " <<
out.length() + OBSIZ - osiz << "\n");
LOGDEB1(" Input consumed " << ip - in.c_str() <<
" output produced " << out.length()+OBSIZ-osiz << "\n");
out.append(obuf, OBSIZ - osiz);
out += "?";
mecnt++;

1
src/windows/execmd_w.cpp
View File

@ -968,7 +968,6 @@ int ExecCmd::receive(string& data, int cnt)
int ExecCmd::getline(string& data)
{
LOGDEB2("ExecCmd::getline: cnt " << cnt << ", timeo " << timeo << "\n");
data.erase();
if (m->m_buf.empty()) {
m->m_buf.reserve(4096);