summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-06-29 18:47:27 (UTC)
committer Michael Krelin <hacker@klever.net>2008-06-29 18:47:27 (UTC)
commit73f6183b26b1ebc460a27554b71e44037c07e09c (patch) (side-by-side diff)
treeebb9d9af6008a3946220e1b65f6b464ccf687546
parent12837594b705ad10fdadfd0ba1bfc2249b3b1264 (diff)
downloadlibopkele-73f6183b26b1ebc460a27554b71e44037c07e09c.zip
libopkele-73f6183b26b1ebc460a27554b71e44037c07e09c.tar.gz
libopkele-73f6183b26b1ebc460a27554b71e44037c07e09c.tar.bz2
fixed debugging info settings for htmltidy
Thanks to Brian Muller for spotting it! Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--lib/discovery.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 984e308..bd1f917 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -232,51 +232,54 @@ namespace opkele {
throw exception_curl(OPKELE_CP_ "failed to set curly urlie",r);
http_content_type.clear();
xmode = xm;
prepare_to_parse();
if(xmode&xmode_html) {
xrds_location.clear();
save_html.clear();
save_html.reserve(max_html);
}
xrd = &idis.xrd;
r = easy_perform();
if(r && r!=CURLE_WRITE_ERROR)
throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
if(!parser_choked) {
parse(0,0,true);
}else if(xmode&xmode_html){
/* TODO: do not bother if we've seen xml */
try {
util::tidy_doc_t td = util::tidy_doc_t::create();
if(!td)
throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document");
-#ifndef NDEBUG
- td.opt_set(TidyQuiet,false);
+#ifdef NDEBUG
+ td.opt_set(TidyQuiet,true);
td.opt_set(TidyShowWarnings,false);
+#else /* NDEBUG */
+ td.opt_set(TidyQuiet,false);
+ td.opt_set(TidyShowWarnings,true);
#endif /* NDEBUG */
td.opt_set(TidyForceOutput,true);
td.opt_set(TidyXhtmlOut,true);
td.opt_set(TidyDoctypeMode,TidyDoctypeOmit);
td.opt_set(TidyMark,false);
td.opt_set(TidyNumEntities,true);
if(td.parse_string(save_html)<=0)
throw exception_tidy(OPKELE_CP_ "tidy failed to parse document");
if(td.clean_and_repair()<=0)
throw exception_tidy(OPKELE_CP_ "tidy failed to clean and repair");
util::tidy_buf_t tide;
if(td.save_buffer(tide)<=0)
throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer");
prepare_to_parse();
parse(tide.c_str(),tide.size(),true);
}catch(exception_tidy& et) { }
}
save_html.clear();
}
void prepare_to_parse() {
(*(expat_t*)this) = parser_create_ns();
set_user_data(); set_element_handler();
set_character_data_handler();