Changeset 1237

Timestamp:

06/08/08 19:32:50 (3 months ago)

Author:

drobilla

Message:

Use less ugly blank node IDs.

Files:

• redlandmm/redlandmm/World.hpp (modified) (2 diffs)
• redlandmm/src/World.cpp (modified) (3 diffs)

redlandmm/redlandmm/World.hpp

@@ -21 +21 @@
-#include <stdexcept>
-#include <string>
+#include <set>
-#include <librdf.h>
-#include <boost/utility.hpp>
@@ -56 +57 @@
-        Namespaces    _prefixes;
-
-ize_t _next_blank_id
+td::set<std::string> _blank_ids
-};
-

redlandmm/src/World.cpp

@@ -35 +35 @@
- */
-World::World()
-        : _next_blank_id(1)
-{
-        _c_obj = librdf_new_world();
@@ -87 +86 @@
-World::blank_id(const string base_name)
-{
+        /*
-        std::ostringstream ss;
-        ss << "b" << _next_blank_id++;
@@ -96 +96 @@
-        assert(result.to_string() == ss.str());
-        return result;
+        */
+
+        string name = base_name;
+        for (unsigned i = 2; _blank_ids.find(name) != _blank_ids.end(); ++i) {
+                std::ostringstream ss;
+                ss << "_" << i;
+                name = ss.str();
+        }
+        
+        Node result = Node(*this, Node::BLANK, name);
+        assert(result.to_string() == name);
+        return result;
-}
-