X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.h;h=89e801ffa87850ebcba5b5452c03a4a15a4dbf0b;hb=116ea4040cbfa5b6985e95577fd7e029cc2bf30b;hp=a7ac59bc8069b19697fab896826ef499b3a84e8d;hpb=8b7cadfa3b5a72ecf466c589e1c8328d8500b588;p=libs%2Fdatafile.git

diff --git a/source/collection.h b/source/collection.h
index a7ac59b..89e801f 100644
--- a/source/collection.h
+++ b/source/collection.h
@@ -83,7 +83,7 @@ public:
 private:
 	typedef std::map<std::string, Variant> ItemMap;
 	typedef std::list<CollectionItemTypeBase *> TypeList;
-	typedef std::list<CollectionSource *> SourceList;
+	typedef std::list<const CollectionSource *> SourceList;
 
 	TypeList types;
 	ItemMap items;
@@ -131,7 +131,7 @@ public:
 	T &get(const std::string &name)
 	{
 		typedef typename RemoveConst<T>::Type NCT;
-		return extract<NCT>(get_var(name, get_type<NCT>()));
+		return extract<NCT>(get_var(name, get_type<NCT>(name)));
 	}
 
 private:
@@ -251,9 +251,13 @@ protected:
 	CollectionItemType<T> &add_type();
 
 private:
-	/// Returns the descriptor for a type, or null if one isn't defined.
+	/** Returns the descriptor for a type, or null if one isn't defined.  An
+	optional name can be given to prioritize matching types. */
 	template<typename T>
-	CollectionItemTypeBase *get_type() const;
+	CollectionItemTypeBase *get_type(const std::string & = std::string()) const;
+
+	/// Gets a descriptor with the same type as another descriptor.
+	CollectionItemTypeBase *get_type(const CollectionItemTypeBase &) const;
 
 	/// Returns the descriptor for an item, or null if it's of an unknown type.
 	CollectionItemTypeBase *get_type_for_item(const Variant &) const;
@@ -261,12 +265,16 @@ private:
 protected:
 	/** Adds a source for automatically loading items.  Sources are consulted
 	in the order they are added. */
-	void add_source(CollectionSource &);
+	void add_source(const CollectionSource &);
 
+public:
 	/** Opens a raw resource, without interpreting it as object data.  Null is
 	returned if no such file is found.  The caller must dispose of the returned
 	object when done with it. */
-	IO::Seekable *open_from_sources(const std::string &);
+	IO::Seekable *open_raw(const std::string &) const;
+
+protected:
+	IO::Seekable *open_from_sources(const std::string &n) { return open_raw(n); }
 
 private:
 	void gather_names_from_sources(std::list<std::string> &, const CollectionItemTypeBase &) const;
@@ -277,6 +285,8 @@ protected:
 	/** Sets a fallback collection, which will be consulted if an item is not
 	found. */
 	void set_fallback(Collection *);
+
+	Collection *get_fallback() const { return fallback; }
 };
 
 template<typename T>
@@ -376,7 +386,7 @@ private:
 		Creator(FuncPtr f): func(f) { }
 
 		virtual T *create(Collection &coll, const std::string &name) const
-		{ return (static_cast<C &>(coll).*func)(name); }
+		{ return (dynamic_cast<C &>(coll).*func)(name); }
 	};
 
 	template<typename B>
@@ -491,15 +501,20 @@ CollectionItemType<T> &Collection::add_type()
 }
 
 template<typename T>
-CollectionItemTypeBase *Collection::get_type() const
+CollectionItemTypeBase *Collection::get_type(const std::string &name) const
 {
 	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
 		if(dynamic_cast<CollectionItemType<T> *>(*j))
 			return *j;
+	CollectionItemTypeBase *type = 0;
 	for(TypeList::const_iterator j=types.begin(); j!=types.end(); ++j)
 		if((*j)->can_extract<T>())
-			return *j;
-	return 0;
+		{
+			if(!name.empty() && (*j)->match_name(name))
+				return *j;
+			type = *j;
+		}
+	return type;
 }
 
 } // namespace DataFile