Add find functions to Collection

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

diff --git a/source/collection.cpp b/source/collection.cpp
index cffb7e22e7041ba48268c9643c6d7791e118407f..6d7306357712c2b737f9ff5d8232a6888b5daffb 100644 (file)
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -17,10 +17,19 @@ Collection::~Collection()
 }
 
 const Variant &Collection::get_var(const string &name, const CollectionItemTypeBase *type)
+{
+       const Variant *var = find_var(name, type);
+       if(var)
+               return *var;
+
+       throw key_error(name);
+}
+
+const Variant *Collection::find_var(const string &name, const CollectionItemTypeBase *type)
 {
        ItemMap::iterator i = items.find(name);
        if(i!=items.end())
-               return i->second;
+               return &i->second;
 
        if(type)
        {
@@ -36,21 +45,16 @@ const Variant &Collection::get_var(const string &name, const CollectionItemTypeB
                        loaded = items.count(name);
                }
                if(!loaded && fallback)
-               {
-                       for(TypeList::const_iterator j=fallback->types.begin(); j!=fallback->types.end(); ++j)
-                               if((*j)->is_same_type(*type))
-                               {
-                                       if(fallback->get_status(name, **j))
-                                               return fallback->get_var(name, *j);
-                                       break;
-                               }
-               }
+                       if(CollectionItemTypeBase *fb_type = fallback->get_type(*type))
+                               if(fallback->get_status(name, *fb_type))
+                                       return fallback->find_var(name, fb_type);
        }
 
-       return get_item(items, name);
+       i = items.find(name);
+       return (i!=items.end() ? &i->second : 0);
 }
 
-void Collection::gather_items(list<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
+void Collection::gather_items(vector<const Variant *> *vars, list<string> *names, const CollectionItemTypeBase &type, bool include_sources) const
 {
        for(ItemMap::const_iterator i=items.begin(); i!=items.end(); ++i)
                if(type.check_item_type(i->second))
@@ -73,12 +77,23 @@ unsigned Collection::get_status(const string &name, const CollectionItemTypeBase
                for(SourceList::const_iterator j=sources.begin(); j!=sources.end(); ++j)
                        if((*j)->is_loadable(type, name))
                                return 2;
+               if(fallback)
+                       if(CollectionItemTypeBase *fb_type = fallback->get_type(type))
+                               return fallback->get_status(name, *fb_type);
                return 0;
        }
 
        return type.check_item_type(i->second);
 }
 
+CollectionItemTypeBase *Collection::get_type(const CollectionItemTypeBase &type) const
+{
+       for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
+               if((*j)->is_same_type(type))
+                       return *j;
+       return 0;
+}
+
 CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
 {
        for(TypeList::const_iterator i=types.begin(); i!=types.end(); ++i)
@@ -87,7 +102,7 @@ CollectionItemTypeBase *Collection::get_type_for_item(const Variant &var) const
        return 0;
 }
 
-void Collection::add_source(CollectionSource &s)
+void Collection::add_source(const CollectionSource &s)
 {
        sources.push_back(&s);
 }