1 files changed, 7 insertions, 3 deletions

diff --git a/lib/discovery.cc b/lib/discovery.cc
index ea53786..3b184ee 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -1,6 +1,4 @@
-#include <iostream>
-using namespace std;
 #include <list>
 #include <opkele/curl.h>
 #include <opkele/expat.h>
 #include <opkele/uris.h>
@@ -230,9 +228,8 @@ namespace opkele {
                     }
                 }else{
                     int pt_s = pt_stack.size();
                     if(pt_s==1) {
-                        /* TODO: xrd:XRD/xrd:Expires */
                         if(is_qelement(n,NSURI_XRD "\tCanonicalID")) {
                             assert(xrd);
                             cdata = &(xrd->canonical_ids.add(element_priority(a),string()));
                         }else if(is_qelement(n,NSURI_XRD "\tLocalID")) {
@@ -252,8 +249,12 @@ namespace opkele {
                                         break;
                                     }
                                 }
                             }
+                        }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
+                            assert(xrd);
+                            cdata_buf.clear();
+                            cdata = &cdata_buf;
                         }else if(xmode&xmode_html) {
                             html_start_element(n,a);
                         }else{
                             skipping = 1;
@@ -304,8 +305,11 @@ namespace opkele {
                         pt_stack.pop_back();
                         if(status_code!=100)
                             skipping = -1;
                     }
+                }else if(is_qelement(n,NSURI_XRD "\tExpires")) {
+                    assert(xrd);
+                    xrd->expires = util::w3c_to_time(cdata_buf);
                 }else if((xmode&xmode_html) && is_element(n,"head")) {
                     skipping = -1;
                 }
                 cdata = 0;