Skip to content

Commit ed3ccbd

Browse files
veloman-yunkankelson42
authored andcommitted
libzim reader code no longer prints to stdout
This is a quick fix to zimcheck's output being polluted by libzim's own unsolicited messages. Writer code keeps printing to stdout but it's less of a concern
1 parent 89f0d69 commit ed3ccbd

4 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/search.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ Xapian::Enquire& Search::getEnquire() const
307307

308308
auto query = mp_internalDb->parseQuery(m_query);
309309
if (mp_internalDb->m_verbose) {
310-
std::cout << "Parsed query '" << m_query.m_query << "' to " << query.get_description() << std::endl;
310+
std::cerr << "Parsed query '" << m_query.m_query << "' to " << query.get_description() << std::endl;
311311
}
312312
enquire->set_query(query);
313313

src/suggestion.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Xapian::Enquire& SuggestionSearch::getEnquire() const
262262
const auto unaccentedQuery = removeAccents(m_query);
263263
auto query = mp_internalDb->parseQuery(unaccentedQuery);
264264
if (mp_internalDb->m_verbose) {
265-
std::cout << "Parsed query '" << unaccentedQuery << "' to " << query.get_description() << std::endl;
265+
std::cerr << "Parsed query '" << unaccentedQuery << "' to " << query.get_description() << std::endl;
266266
}
267267
enquire->set_query(query);
268268

src/tools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ Xapian::Stem zim::getXapianStemmer(const std::string& iso639LangCode)
360360
try {
361361
stemmer = Xapian::Stem(twoLetterLangCode);
362362
} catch (...) {
363-
std::cout << "No stemming for language '" << twoLetterLangCode << "'" << std::endl;
363+
std::cerr << "No stemming for language '" << twoLetterLangCode << "'" << std::endl;
364364
}
365365
}
366366
return stemmer;

src/xapian/htmlparse.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ zim::HtmlParser::parse_html(const string &body)
212212
if (enc == string::npos || enc == decl.size()) break;
213213

214214
if (decl[enc] != '=') break;
215-
215+
216216
enc = decl.find_first_not_of(" \t\r\n", enc + 1);
217217
if (enc == string::npos || enc == decl.size()) break;
218218

@@ -355,12 +355,12 @@ zim::HtmlParser::parse_html(const string &body)
355355
}
356356
}
357357
#if 0
358-
cout << "<" << tag;
358+
cerr << "<" << tag;
359359
map<string, string>::const_iterator x;
360360
for (x = parameters.begin(); x != parameters.end(); x++) {
361-
cout << " " << x->first << "=\"" << x->second << "\"";
361+
cerr << " " << x->first << "=\"" << x->second << "\"";
362362
}
363-
cout << ">\n";
363+
cerr << ">\n";
364364
#endif
365365
opening_tag(tag);
366366
parameters.clear();

0 commit comments

Comments
 (0)