3 files changed, 4 insertions, 0 deletions

diff --git a/include/opkele/discovery.h b/include/opkele/discovery.h
index 5d7129b..7865fb2 100644
--- a/include/opkele/discovery.h
+++ b/include/opkele/discovery.h
@@ -3,24 +3,25 @@
 
 #include <string>
 #include <opkele/types.h>
 
 namespace opkele {
     using std::string;
 
     struct idiscovery_t;
 
     void idiscover(idiscovery_t& result,const string& identity);
 
     struct idiscovery_t {
+        bool xri_identity;
         string normalized_id;
         string canonicalized_id;
         xrd::XRD_t xrd;
 
         idiscovery_t(const string& i) {
             idiscover(*this,i);
         }
         idiscovery_t(const char *i) {
             idiscover(*this,i);
         }
 
         void clear() {
diff --git a/lib/discovery.cc b/lib/discovery.cc
index a35ce32..1f23ff1 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -86,35 +86,37 @@ namespace opkele {
                 string::size_type fsc = identity.find_first_not_of(whitespace);
                 if(fsc==string::npos)
                     throw bad_input(OPKELE_CP_ "whtiespace-only identity");
                 string::size_type lsc = identity.find_last_not_of(whitespace);
                 assert(lsc!=string::npos);
                 if(!strncasecmp(identity.c_str()+fsc,"xri://",sizeof("xri://")-1))
                     fsc += sizeof("xri://")-1;
                 if((fsc+1)>=lsc)
                     throw bad_input(OPKELE_CP_ "not a character of importance in identity");
                 string id(identity,fsc,lsc-fsc+1);
                 if(strchr(i_leaders,id[0])) {
                     result.normalized_id = id;
+                    result.xri_identity = true;
                     /* TODO: further canonicalize xri identity? Like folding case  or whatever... */
                     discover_at(
                             result,
                             xri_proxy + util::url_encode(id)+
                             "?_xrd_r=application/xrd+xml;sep=false", xmode_xrd);
                     if(status_code!=100)
                         throw failed_xri_resolution(OPKELE_CP_
                                 "XRI resolution failed with '"+status_string+"' message",status_code);
                     if(result.xrd.canonical_ids.empty())
                         throw opkele::failed_discovery(OPKELE_CP_ "No CanonicalID for XRI identity found");
                 }else{
+                    result.xri_identity = false;
                     if(id.find("://")==string::npos)
                         id.insert(0,"http://");
                     string::size_type fp = id.find('#');
                     if(fp!=string::npos) {
                         string::size_type qp = id.find('?');
                         if(qp==string::npos || qp<fp)
                             id.erase(fp);
                         else if(qp>fp)
                             id.erase(fp,qp-fp);
                     }
                     result.normalized_id = util::rfc_3986_normalize_uri(id);
                     discover_at(result,id,xmode_html|xmode_xrd);
diff --git a/test/idiscover.cc b/test/idiscover.cc
index 2abedc9..05cbcae 100644
--- a/test/idiscover.cc
+++ b/test/idiscover.cc
@@ -27,23 +27,24 @@ ostream& operator<<(ostream& o,const opkele::xrd::service_t s) {
 
 int main(int argc,char **argv) {
     try {
         if(argc<2)
             throw opkele::exception(OPKELE_CP_ "Please, give me something to resolve");
         for(int a=1;a<argc;++a) {
             opkele::idiscovery_t discovery(argv[a]);
             clog
                 << "===============================================================" << endl
                 << "User-supplied ID: " << argv[a] << endl
                 << "Normalized ID: " << discovery.normalized_id << endl
                 << "Canonicalized ID: " << discovery.canonicalized_id << endl
+                << "The identity is " << (discovery.xri_identity?"":"not ") << "an i-name" << endl
                 << endl
                 << "CanonicalID: " << discovery.xrd.canonical_ids << endl
                 << "LocalID: " << discovery.xrd.local_ids << endl
                 << "Services: " << discovery.xrd.services << endl;
         }
     }catch(exception& e) {
         cerr << "oops: " << e.what() << endl;
         _exit(1);
     }
     _exit(0);
 }