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) (unidiff)
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) (ignore 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
@@ -156,13 +156,13 @@ namespace opkele {
156 if(status_code==241) continue; 156 if(status_code==241) continue;
157 if(status_code!=100) 157 if(status_code!=100)
158 throw failed_xri_resolution(OPKELE_CP_ 158 throw failed_xri_resolution(OPKELE_CP_
159 "XRI resolution failed with '"+status_string+"' message" 159 "XRI resolution failed with '"+status_string+"' message"
160 ", while looking for SEP with type '"+st->uri+"'", status_code); 160 ", while looking for SEP with type '"+st->uri+"'", status_code);
161 if(idis.xrd.canonical_ids.empty()) 161 if(idis.xrd.canonical_ids.empty())
162 throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID found for XRI identity found"); 162 throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found");
163 string cid = idis.xrd.canonical_ids.begin()->second; 163 string cid = idis.xrd.canonical_ids.begin()->second;
164 if(cids.find(cid)==cids.end()) { 164 if(cids.find(cid)==cids.end()) {
165 cids.insert(cid); 165 cids.insert(cid);
166 idis.clear(); 166 idis.clear();
167 discover_at( idis, 167 discover_at( idis,
168 xri_proxy + util::url_encode(id)+ 168 xri_proxy + util::url_encode(id)+
@@ -238,13 +238,13 @@ namespace opkele {
238 r = easy_perform(); 238 r = easy_perform();
239 if(r && r!=CURLE_WRITE_ERROR) 239 if(r && r!=CURLE_WRITE_ERROR)
240 throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); 240 throw exception_curl(OPKELE_CP_ "failed to perform curly request",r);
241 241
242 if(!parser_choked) { 242 if(!parser_choked) {
243 parse(0,0,true); 243 parse(0,0,true);
244 }else{ 244 }else if(xmode&xmode_html){
245 /* TODO: do not bother if we've seen xml */ 245 /* TODO: do not bother if we've seen xml */
246 try { 246 try {
247 util::tidy_doc_t td = util::tidy_doc_t::create(); 247 util::tidy_doc_t td = util::tidy_doc_t::create();
248 if(!td) 248 if(!td)
249 throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); 249 throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document");
250#ifndef NDEBUG 250#ifndef NDEBUG