Improve the API for future objects

[libs/datafile.git] / source / collection.cpp

diff --git a/source/collection.cpp b/source/collection.cpp
index a16ae5a9dc2e7a9f70f638093348b59c8bd561eb..5ac12ab7d366c3406cfc59206b42b166875557d5 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -11,20 +11,26 @@ Collection::~Collection()
                delete *i;
 }
 
-void Collection::add_future(const std::string &name)
+void Collection::add_future(const string &name)
 {
-       if(items.count(name))
-               throw key_error(typeid(ItemMap));
-
        for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
                if((*i)->match_name(name))
                {
-                       items.insert(ItemMap::value_type(name, (*i)->create_future()));
+                       insert_unique(items, name, (*i)->create_future());
+                       return;
+               }
+}
+
+void Collection::add_future_with_keyword(const string &name, const string &keyword)
+{
+       for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
+               if((*i)->get_keyword()==keyword)
+               {
+                       insert_unique(items, name, (*i)->create_future());
                        return;
                }
 
-       /* XXX throw something?  If we do, DirectoryCollection needs some way to
-       check if a name matches any item type. */
+       throw runtime_error("Collection::add_future_with_keyword");
 }