X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcollection.cpp;h=a16ae5a9dc2e7a9f70f638093348b59c8bd561eb;hb=8955db30f9cd1c1566b349da29e669f065f84e36;hp=c1d72ca8e3b82e2f3b24b2d550d089efc8e2967c;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/collection.cpp b/source/collection.cpp
index c1d72ca..a16ae5a 100644
--- a/source/collection.cpp
+++ b/source/collection.cpp
@@ -1,30 +1,69 @@
 #include "collection.h"
 
+using namespace std;
+
 namespace Msp {
 namespace DataFile {
 
 Collection::~Collection()
 {
-	for(ItemMap::iterator i = items.begin(); i!=items.end(); ++i)
-		delete i->second;
-	for(ItemKeywordSeq::iterator i = keywords.begin(); i!=keywords.end(); ++i)
-		delete *i;
-	for(ItemCreatorSeq::iterator i = creators.begin(); i!=creators.end(); ++i)
+	for(TypeList::iterator i = types.begin(); i!=types.end(); ++i)
 		delete *i;
 }
 
-bool Collection::contains(const std::string &n) const
+void Collection::add_future(const std::string &name)
 {
-	return items.count(n);
+	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()));
+			return;
+		}
+
+	/* XXX throw something?  If we do, DirectoryCollection needs some way to
+	check if a name matches any item type. */
 }
 
 
 Collection::Loader::Loader(Collection &c):
 	coll(c)
 {	
-	for(ItemKeywordSeq::const_iterator i = coll.keywords.begin(); i!=coll.keywords.end(); ++i)
+	for(TypeList::const_iterator i = coll.types.begin(); i!=coll.types.end(); ++i)
 		(*i)->add_to_loader(*this);
 }
 
+
+CollectionItemTypeBase::CollectionItemTypeBase():
+	tag(0)
+{ }
+
+CollectionItemTypeBase::~CollectionItemTypeBase()
+{
+	delete tag;
+}
+
+void CollectionItemTypeBase::set_keyword(const string &k)
+{
+	kwd = k;
+	if(suffixes.empty())
+		add_suffix("."+kwd);
+}
+
+void CollectionItemTypeBase::add_suffix(const string &s)
+{
+	suffixes.push_back(s);
+}
+
+bool CollectionItemTypeBase::match_name(const string &name) const
+{
+	for(vector<string>::const_iterator i=suffixes.begin(); i!=suffixes.end(); ++i)
+		if(name.size()>i->size() && !name.compare(name.size()-i->size(), string::npos, *i))
+			return true;
+	return false;
+}
+
 } // namespace DataFile
 } // namespace Msp