1 files changed, 38 insertions, 3 deletions

diff --git a/lib/util.cc b/lib/util.cc
index bb8a2e8..29e6738 100644
--- a/lib/util.cc
+++ b/lib/util.cc
@@ -15,2 +15,3 @@
 #include <opkele/exception.h>
+#include <opkele/data.h>
 #include <opkele/debug.h>
@@ -213,5 +214,4 @@ namespace opkele {
          string rfc_3986_normalize_uri(const string& uri) {
-             static const char *whitespace = " \t\r\n";
              string rv;
-             string::size_type ns = uri.find_first_not_of(whitespace);
+             string::size_type ns = uri.find_first_not_of(data::_whitespace_chars);
              if(ns==string::npos)
@@ -225,3 +225,3 @@ namespace opkele {
              bool s;
-             string::size_type ul = uri.find_last_not_of(whitespace)+1;
+             string::size_type ul = uri.find_last_not_of(data::_whitespace_chars)+1;
              if(ul <= (colon+3))
@@ -432,2 +432,37 @@ namespace opkele {
 
+        string normalize_identifier(const string& usi,bool strip_fragment) {
+            if(usi.empty())
+                return usi;
+            string rv;
+            string::size_type fsc = usi.find_first_not_of(data::_whitespace_chars);
+            if(fsc==string::npos)
+                return rv;
+            string::size_type lsc = usi.find_last_not_of(data::_whitespace_chars);
+            assert(lsc!=string::npos);
+            if(!strncasecmp(usi.c_str()+fsc,"xri://",sizeof("xri://")-1))
+                fsc += sizeof("xri://")-1;
+            if( (fsc+1) >= lsc )
+                return rv;
+            rv.assign(usi,fsc,lsc-fsc+1);
+            if(strchr(data::_iname_leaders,rv[0])) {
+                /* TODO: further normalize xri identity, fold case or
+                 * whatever... */
+            }else{
+                if(rv.find("://")==string::npos)
+                    rv.insert(0,"http://");
+                if(strip_fragment) {
+                    string::size_type fp = rv.find('#');
+                    if(fp!=string::npos) {
+                        string::size_type qp = rv.find('?');
+                        if(qp==string::npos || qp<fp)
+                            rv.erase(fp);
+                        else if(qp>fp)
+                            rv.erase(fp,qp-fp);
+                    }
+                }
+                rv = rfc_3986_normalize_uri(rv);
+            }
+            return rv;
+        }
+
     }