X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.cpp;h=f86adf65c71ace3370e7a57537eaa4fe6cd8243a;hb=fbf76ed98dbd2cca6785efe2dd489d717fa5dce6;hp=165b77007fce815eac0b4498d58950895ca1706d;hpb=2af11bfb5184092e58cb9a0055ae03a271af28cb;p=libs%2Fdatafile.git

diff --git a/source/collection.cpp b/source/collection.cpp
index 165b770..f86adf6 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -16,11 +16,27 @@ Collection::~Collection()
 		delete *i;
 }
 
+void Collection::add_var(const string &name, const CollectionItemTypeBase *type, const Variant &var)
+{
+	insert_unique(items, name, var);
+	if(type)
+		type->notify_item(*this, name, var);
+}
+
 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 +52,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 +84,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,12 +109,12 @@ 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);
 }
 
-IO::Seekable *Collection::open_from_sources(const string &name)
+IO::Seekable *Collection::open_raw(const string &name) const
 {
 	for(SourceList::const_iterator i=sources.begin(); i!=sources.end(); ++i)
 		if(IO::Seekable *io = (*i)->open(name))
@@ -121,7 +143,16 @@ void Collection::load_items_from_sources(const CollectionItemTypeBase &type)
 		std::list<std::string> available_names = (*i)->get_names(type);
 		for(std::list<std::string>::iterator j=available_names.begin(); j!=available_names.end(); ++j)
 			if(!items.count(*j))
-				(*i)->load(*this, type, *j);
+			{
+				bool loaded = false;
+				if(type.can_create())
+				{
+					type.create_item(*this, *j);
+					loaded = items.count(*j);
+				}
+				if(!loaded)
+					(*i)->load(*this, type, *j);
+			}
 	}
 }