-rw-r--r-- | lib/discovery.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/discovery.cc b/lib/discovery.cc index af9686a..d868308 100644 --- a/lib/discovery.cc +++ b/lib/discovery.cc | |||
@@ -274,25 +274,25 @@ namespace opkele { | |||
274 | ++skipping; return; | 274 | ++skipping; return; |
275 | } | 275 | } |
276 | if(pt_stack.empty()) { | 276 | if(pt_stack.empty()) { |
277 | if(is_qelement(n,NSURI_XRDS "\tXRDS")) | 277 | if(is_qelement(n,NSURI_XRDS "\tXRDS")) |
278 | return; | 278 | return; |
279 | if(is_qelement(n,NSURI_XRD "\tXRD")) { | 279 | if(is_qelement(n,NSURI_XRD "\tXRD")) { |
280 | assert(xrd); | 280 | assert(xrd); |
281 | xrd->clear(); | 281 | xrd->clear(); |
282 | pt_stack.push_back(n); | 282 | pt_stack.push_back(n); |
283 | }else if(xmode&xmode_html) { | 283 | }else if(xmode&xmode_html) { |
284 | html_start_element(n,a); | 284 | html_start_element(n,a); |
285 | }else{ | 285 | }else{ |
286 | skipping = -1; stop_parser(); | 286 | skipping = -1; |
287 | } | 287 | } |
288 | }else{ | 288 | }else{ |
289 | int pt_s = pt_stack.size(); | 289 | int pt_s = pt_stack.size(); |
290 | if(pt_s==1) { | 290 | if(pt_s==1) { |
291 | if(is_qelement(n,NSURI_XRD "\tCanonicalID")) { | 291 | if(is_qelement(n,NSURI_XRD "\tCanonicalID")) { |
292 | assert(xrd); | 292 | assert(xrd); |
293 | cdata = &(xrd->canonical_ids.add(element_priority(a),string())); | 293 | cdata = &(xrd->canonical_ids.add(element_priority(a),string())); |
294 | }else if(is_qelement(n,NSURI_XRD "\tLocalID")) { | 294 | }else if(is_qelement(n,NSURI_XRD "\tLocalID")) { |
295 | assert(xrd); | 295 | assert(xrd); |
296 | cdata = &(xrd->local_ids.add(element_priority(a),string())); | 296 | cdata = &(xrd->local_ids.add(element_priority(a),string())); |
297 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { | 297 | }else if(is_qelement(n,NSURI_XRD "\tProviderID")) { |
298 | assert(xrd); | 298 | assert(xrd); |
@@ -359,33 +359,32 @@ namespace opkele { | |||
359 | xrd_service->types.insert(cdata_buf); | 359 | xrd_service->types.insert(cdata_buf); |
360 | }else if(is_qelement(n,NSURI_XRD "\tService")) { | 360 | }else if(is_qelement(n,NSURI_XRD "\tService")) { |
361 | assert(xrd); assert(xrd_service); | 361 | assert(xrd); assert(xrd_service); |
362 | assert(!pt_stack.empty()); | 362 | assert(!pt_stack.empty()); |
363 | assert(pt_stack.back()==(NSURI_XRD "\tService")); | 363 | assert(pt_stack.back()==(NSURI_XRD "\tService")); |
364 | pt_stack.pop_back(); | 364 | pt_stack.pop_back(); |
365 | xrd_service = 0; | 365 | xrd_service = 0; |
366 | }else if(is_qelement(n,NSURI_XRD "\tStatus")) { | 366 | }else if(is_qelement(n,NSURI_XRD "\tStatus")) { |
367 | assert(xrd); | 367 | assert(xrd); |
368 | if(is_qelement(pt_stack.back().c_str(),n)) { | 368 | if(is_qelement(pt_stack.back().c_str(),n)) { |
369 | assert(cdata==&status_string); | 369 | assert(cdata==&status_string); |
370 | pt_stack.pop_back(); | 370 | pt_stack.pop_back(); |
371 | if(status_code!=100) { | 371 | if(status_code!=100) |
372 | skipping = -1; stop_parser(); | 372 | skipping = -1; |
373 | } | ||
374 | } | 373 | } |
375 | }else if(is_qelement(n,NSURI_XRD "\tExpires")) { | 374 | }else if(is_qelement(n,NSURI_XRD "\tExpires")) { |
376 | assert(xrd); | 375 | assert(xrd); |
377 | xrd->expires = util::w3c_to_time(cdata_buf); | 376 | xrd->expires = util::w3c_to_time(cdata_buf); |
378 | }else if((xmode&xmode_html) && is_element(n,"head")) { | 377 | }else if((xmode&xmode_html) && is_element(n,"head")) { |
379 | skipping = -1; stop_parser(); | 378 | skipping = -1; |
380 | } | 379 | } |
381 | cdata = 0; | 380 | cdata = 0; |
382 | } | 381 | } |
383 | void character_data(const XML_Char *s,int l) { | 382 | void character_data(const XML_Char *s,int l) { |
384 | if(skipping) return; | 383 | if(skipping) return; |
385 | if(cdata) cdata->append(s,l); | 384 | if(cdata) cdata->append(s,l); |
386 | } | 385 | } |
387 | 386 | ||
388 | void html_start_element(const XML_Char *n,const XML_Char **a) { | 387 | void html_start_element(const XML_Char *n,const XML_Char **a) { |
389 | if(is_element(n,"meta")) { | 388 | if(is_element(n,"meta")) { |
390 | bool heq = false; | 389 | bool heq = false; |
391 | string l; | 390 | string l; |
@@ -424,24 +423,24 @@ namespace opkele { | |||
424 | ns = s; | 423 | ns = s; |
425 | } | 424 | } |
426 | if(rel=="openid.server") | 425 | if(rel=="openid.server") |
427 | html_openid1.uris.add(-1,href); | 426 | html_openid1.uris.add(-1,href); |
428 | else if(rel=="openid.delegate") | 427 | else if(rel=="openid.delegate") |
429 | html_openid1.local_ids.add(-1,href); | 428 | html_openid1.local_ids.add(-1,href); |
430 | else if(rel=="openid2.provider") | 429 | else if(rel=="openid2.provider") |
431 | html_openid2.uris.add(-1,href); | 430 | html_openid2.uris.add(-1,href); |
432 | else if(rel=="openid2.local_id") | 431 | else if(rel=="openid2.local_id") |
433 | html_openid2.local_ids.add(-1,href); | 432 | html_openid2.local_ids.add(-1,href); |
434 | } | 433 | } |
435 | }else if(is_element(n,"body")) { | 434 | }else if(is_element(n,"body")) { |
436 | skipping = -1; stop_parser(); | 435 | skipping = -1; |
437 | } | 436 | } |
438 | } | 437 | } |
439 | 438 | ||
440 | }; | 439 | }; |
441 | 440 | ||
442 | void idiscover(idiscovery_t& result,const string& identity) { | 441 | void idiscover(idiscovery_t& result,const string& identity) { |
443 | idigger_t idigger; | 442 | idigger_t idigger; |
444 | idigger.discover(result,identity); | 443 | idigger.discover(result,identity); |
445 | } | 444 | } |
446 | 445 | ||
447 | } | 446 | } |