Added utility function rdf::cleanURI() to convert a string into a correct URI

string.


git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@110 83718e91-0e4f-0410-abf4-91180603181f

2 files changed, 31 insertions, 2 deletions

diff --git a/src/rdf.cc b/src/rdf.cc
index 8563795..06ca778 100644
--- a/src/rdf.cc
+++ b/src/rdf.cc
@@ -239,8 +239,10 @@ namespace Formaline
           assert (ierr >= 0);
           if (ierr > 0) break;
 
+          // brackets in array parameter names have to be escaped
           msgbuf << "\t<cctk:hasParameter rdf:resource=\"#Parameters/"
-                 << pdata->thorn << "/" << pdata->name << "\"/>" << endl;
+                 << pdata->thorn << "/" << cleanURI (pdata->name) << "\"/>"
+                 << endl;
 
           // get its value
           const void* const pvalue
@@ -296,8 +298,10 @@ namespace Formaline
 
             } // switch (pdata->type)
 
+            // brackets in array parameter names have to be escaped
             parambuf << "<cctk:" << paramtype << " rdf:about=\"#Parameters/"
-                     << pdata->thorn << "/" << pdata->name << "\">" << endl
+                     << pdata->thorn << "/" << cleanURI (pdata->name) << "\">"
+                     << endl
                      << "\t<cctk:hasName>" << fullname
                      << "</cctk:hasName>" << endl
                      << "\t<cctk:hasValue>" << paramvaluebuf.str()
@@ -558,6 +562,27 @@ namespace Formaline
   }
 
 
+  string rdf::
+  cleanURI (string const & uri)
+    const
+  {
+    const string allowed_charset ("-_.!~*'()/");
+    ostringstream buf;
+
+    for (string::const_iterator p = uri.begin(); p != uri.end(); ++ p) {
+      if (isalnum (*p) or allowed_charset.find (*p, 0) != string::npos) {
+        buf << *p;
+      } else if (*p == ' ') {
+        buf << '+';
+      } else {
+        buf << '%' << hex << int (*p);
+      }
+    }
+
+    return buf.str();
+  }
+
+
 
 #if 0
   static list<string>
diff --git a/src/rdf.hh b/src/rdf.hh
index e8a890f..cef3f5e 100644
--- a/src/rdf.hh
+++ b/src/rdf.hh
@@ -55,6 +55,10 @@ namespace Formaline
     clean (std::string const & txt)
       const;
 
+    std::string
+    cleanURI (std::string const & uri)
+      const;
+
     void Initial (void);
     void Update (cGH const * cctkGH);
   };