author | Michael Krelin <hacker@klever.net> | 2008-01-06 21:02:45 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-06 21:04:42 (UTC) |
commit | 6a843bb112988976892058c56d5fe2f24e24300a (patch) (unidiff) | |
tree | 9e3ab16ed4863f9bbbffeded740788e14d5e4501 | |
parent | 6529fa45df73aed1cad363da02386b036798a636 (diff) | |
download | libopkele-6a843bb112988976892058c56d5fe2f24e24300a.zip libopkele-6a843bb112988976892058c56d5fe2f24e24300a.tar.gz libopkele-6a843bb112988976892058c56d5fe2f24e24300a.tar.bz2 |
Fix non-debug tidying.
somehow I've managed to put too many tidying options into conditional.
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | lib/discovery.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index a308b56..af9686a 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -140,69 +140,69 @@ namespace opkele { | |||
140 | } | 140 | } |
141 | 141 | ||
142 | void discover_at(idiscovery_t& result,const string& url,int xm) { | 142 | void discover_at(idiscovery_t& result,const string& url,int xm) { |
143 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); | 143 | CURLcode r = easy_setopt(CURLOPT_URL,url.c_str()); |
144 | if(r) | 144 | if(r) |
145 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); | 145 | throw exception_curl(OPKELE_CP_ "failed to set culry urlie",r); |
146 | 146 | ||
147 | http_content_type.clear(); | 147 | http_content_type.clear(); |
148 | xmode = xm; | 148 | xmode = xm; |
149 | prepare_to_parse(); | 149 | prepare_to_parse(); |
150 | if(xmode&xmode_html) { | 150 | if(xmode&xmode_html) { |
151 | xrds_location.clear(); | 151 | xrds_location.clear(); |
152 | save_html.clear(); | 152 | save_html.clear(); |
153 | save_html.reserve(max_html); | 153 | save_html.reserve(max_html); |
154 | } | 154 | } |
155 | xrd = &result.xrd; | 155 | xrd = &result.xrd; |
156 | 156 | ||
157 | r = easy_perform(); | 157 | r = easy_perform(); |
158 | if(r && r!=CURLE_WRITE_ERROR) | 158 | if(r && r!=CURLE_WRITE_ERROR) |
159 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); | 159 | throw exception_curl(OPKELE_CP_ "failed to perform curly request",r); |
160 | 160 | ||
161 | if(!parser_choked) { | 161 | if(!parser_choked) { |
162 | parse(0,0,true); | 162 | parse(0,0,true); |
163 | }else{ | 163 | }else{ |
164 | /* TODO: do not bother if we've seen xml */ | 164 | /* TODO: do not bother if we've seen xml */ |
165 | try { | 165 | try { |
166 | util::tidy_doc_t td = util::tidy_doc_t::create(); | 166 | util::tidy_doc_t td = util::tidy_doc_t::create(); |
167 | if(!td) | 167 | if(!td) |
168 | throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); | 168 | throw exception_tidy(OPKELE_CP_ "failed to create htmltidy document"); |
169 | #ifndef NDEBUG | 169 | #ifndef NDEBUG |
170 | td.opt_set(TidyQuiet,false); | 170 | td.opt_set(TidyQuiet,false); |
171 | td.opt_set(TidyShowWarnings,false); | 171 | td.opt_set(TidyShowWarnings,false); |
172 | #endif /* NDEBUG */ | ||
172 | td.opt_set(TidyForceOutput,true); | 173 | td.opt_set(TidyForceOutput,true); |
173 | td.opt_set(TidyXhtmlOut,true); | 174 | td.opt_set(TidyXhtmlOut,true); |
174 | td.opt_set(TidyDoctypeMode,TidyDoctypeOmit); | 175 | td.opt_set(TidyDoctypeMode,TidyDoctypeOmit); |
175 | td.opt_set(TidyMark,false); | 176 | td.opt_set(TidyMark,false); |
176 | #endif /* NDEBUG */ | ||
177 | if(td.parse_string(save_html)<=0) | 177 | if(td.parse_string(save_html)<=0) |
178 | throw exception_tidy(OPKELE_CP_ "tidy failed to parse document"); | 178 | throw exception_tidy(OPKELE_CP_ "tidy failed to parse document"); |
179 | if(td.clean_and_repair()<=0) | 179 | if(td.clean_and_repair()<=0) |
180 | throw exception_tidy(OPKELE_CP_ "tidy failed to clean and repair"); | 180 | throw exception_tidy(OPKELE_CP_ "tidy failed to clean and repair"); |
181 | util::tidy_buf_t tide; | 181 | util::tidy_buf_t tide; |
182 | if(td.save_buffer(tide)<=0) | 182 | if(td.save_buffer(tide)<=0) |
183 | throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer"); | 183 | throw exception_tidy(OPKELE_CP_ "tidy failed to save buffer"); |
184 | prepare_to_parse(); | 184 | prepare_to_parse(); |
185 | parse(tide.c_str(),tide.size(),true); | 185 | parse(tide.c_str(),tide.size(),true); |
186 | }catch(exception_tidy& et) { } | 186 | }catch(exception_tidy& et) { } |
187 | } | 187 | } |
188 | save_html.clear(); | 188 | save_html.clear(); |
189 | } | 189 | } |
190 | 190 | ||
191 | void prepare_to_parse() { | 191 | void prepare_to_parse() { |
192 | (*(expat_t*)this) = parser_create_ns(); | 192 | (*(expat_t*)this) = parser_create_ns(); |
193 | set_user_data(); set_element_handler(); | 193 | set_user_data(); set_element_handler(); |
194 | set_character_data_handler(); | 194 | set_character_data_handler(); |
195 | 195 | ||
196 | if(xmode&xmode_html) { | 196 | if(xmode&xmode_html) { |
197 | html_openid1.clear(); html_openid2.clear(); | 197 | html_openid1.clear(); html_openid2.clear(); |
198 | parser_choked = false; | 198 | parser_choked = false; |
199 | } | 199 | } |
200 | 200 | ||
201 | cdata = 0; xrd_service = 0; skipping = 0; | 201 | cdata = 0; xrd_service = 0; skipping = 0; |
202 | status_code = 100; status_string.clear(); | 202 | status_code = 100; status_string.clear(); |
203 | } | 203 | } |
204 | 204 | ||
205 | void html2xrd(XRD_t& x) { | 205 | void html2xrd(XRD_t& x) { |
206 | if(!html_openid1.uris.empty()) { | 206 | if(!html_openid1.uris.empty()) { |
207 | html_openid1.types.insert(STURI_OPENID11); | 207 | html_openid1.types.insert(STURI_OPENID11); |
208 | x.services.add(-1,html_openid1); | 208 | x.services.add(-1,html_openid1); |