keep track of whether the identity being discovered is XRI

Signed-off-by: Michael Krelin <hacker@klever.net>

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
@@ -12,6 +12,7 @@ namespace opkele {
     void idiscover(idiscovery_t& result,const string& identity);
 
     struct idiscovery_t {
+        bool xri_identity;
         string normalized_id;
         string canonicalized_id;
         xrd::XRD_t xrd;
diff --git a/lib/discovery.cc b/lib/discovery.cc
index a35ce32..1f23ff1 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -95,6 +95,7 @@ namespace opkele {
                 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,
@@ -106,6 +107,7 @@ namespace opkele {
                     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('#');
diff --git a/test/idiscover.cc b/test/idiscover.cc
index 2abedc9..05cbcae 100644
--- a/test/idiscover.cc
+++ b/test/idiscover.cc
@@ -36,6 +36,7 @@ int main(int argc,char **argv) {
                 << "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