summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-02-16 22:45:49 (UTC)
committer Michael Krelin <hacker@klever.net>2008-02-16 22:45:49 (UTC)
commitc18b77c610d0f963a274420a6558629d198818ee (patch) (side-by-side diff)
tree953a2ab1e3b436f00d383e4c9c6fe87e3b876b80
parent21bddce2d98394865cf2ed0b144f92bbb6993bc9 (diff)
downloadlibopkele-c18b77c610d0f963a274420a6558629d198818ee.zip
libopkele-c18b77c610d0f963a274420a6558629d198818ee.tar.gz
libopkele-c18b77c610d0f963a274420a6558629d198818ee.tar.bz2
do not tidy XRD documents
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--lib/discovery.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc
index 6f9926c..b7f2db6 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -150,25 +150,25 @@ namespace opkele {
discover_at( idis,
xri_proxy + util::url_encode(id)+
"?_xrd_t="+util::url_encode(st->uri)+
"&_xrd_r=application/xrd%2Bxml"
";sep=true;refs=true",
xmode_xrd );
if(status_code==241) continue;
if(status_code!=100)
throw failed_xri_resolution(OPKELE_CP_
"XRI resolution failed with '"+status_string+"' message"
", while looking for SEP with type '"+st->uri+"'", status_code);
if(idis.xrd.canonical_ids.empty())
- throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID found for XRI identity found");
+ throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found");
string cid = idis.xrd.canonical_ids.begin()->second;
if(cids.find(cid)==cids.end()) {
cids.insert(cid);
idis.clear();
discover_at( idis,
xri_proxy + util::url_encode(id)+
"?_xrd_t="+util::url_encode(st->uri)+
"&_xrd_r=application/xrd%2Bxml"
";sep=true;refs=true",
xmode_xrd );
if(status_code==241) continue;
if(status_code!=100)
@@ -232,25 +232,25 @@ namespace opkele {
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{
+ }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);
td.opt_set(TidyShowWarnings,false);
#endif /* NDEBUG */
td.opt_set(TidyForceOutput,true);
td.opt_set(TidyXhtmlOut,true);
td.opt_set(TidyDoctypeMode,TidyDoctypeOmit);