X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fcatalogue.cpp;h=8faaa102596a2db071d23bc70135bdf227f29fcd;hb=3df8cb5c78fbb0b919bcb79677c6c788b8028482;hp=3c8e279bcf354a957f05a418c2592538b3f97f67;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 3c8e279..8faaa10 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,63 +1,80 @@
-#include <fstream>
-#include <msp/parser/parser.h>
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2009  Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
+#include <msp/core/refptr.h>
+#include <msp/datafile/parser.h>
 #include "catalogue.h"
-#include "track.h"
+#include "locotype.h"
+#include "tracktype.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Track *Catalogue::get_track(unsigned art_nr)
+Catalogue::~Catalogue()
 {
-	TrackMap::const_iterator i=tracks.find(art_nr);
+	for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		delete i->second;
+}
+
+TrackType &Catalogue::get_track(unsigned art_nr) const
+{
+	map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
+	if(i==tracks.end())
+		throw KeyError("Unknown track type");
+
+	return *i->second;
+}
 
-	if(i!=tracks.end())
-		return i->second;
+LocoType &Catalogue::get_locomotive(unsigned art_nr) const
+{
+	map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
+	if(i==locos.end())
+		throw KeyError("Unknown locomotive type");
 
-	return 0;
+	return *i->second;
 }
 
 void Catalogue::load(const string &fn)
 {
-	ifstream in(fn.c_str());
-	if(!in)
-		throw Exception("File not found");
+	IO::File in(fn.c_str());
 
-	Parser::Parser parser(in, fn);
+	DataFile::Parser parser(in, fn);
 	Loader loader(*this);
 	loader.load(parser);
 }
 
-Catalogue::~Catalogue()
-{
-	for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		delete i->second;
-}
 
 Catalogue::Loader::Loader(Catalogue &c):
-	cat(c)
+	DataFile::BasicLoader<Catalogue>(c)
 {
+	add("locomotive", &Loader::locomotive);
 	add("track", &Loader::track);
 }
 
-void Catalogue::Loader::track(unsigned art_no)
+void Catalogue::Loader::locomotive(unsigned art_nr)
+{
+	if(obj.locos.count(art_nr))
+		throw Exception("Duplicate locomotive number");
+
+	RefPtr<LocoType> loco=new LocoType(art_nr);
+	load_sub(*loco);
+	obj.locos[art_nr]=loco.release();
+}
+
+void Catalogue::Loader::track(unsigned art_nr)
 {
-	TrackMap::iterator i=cat.tracks.find(art_no);
-	if(i!=cat.tracks.end())
+	if(obj.tracks.count(art_nr))
 		throw Exception("Duplicate track number");
 
-	Track *trk=new Track(art_no);
-	try
-	{
-		load_sub(*trk);
-	}
-	catch(const Msp::Exception &)
-	{
-		delete trk;
-		throw;
-	}
-	cat.tracks.insert(TrackMap::value_type(trk->get_article_number(), trk));
+	RefPtr<TrackType> trk=new TrackType(art_nr);
+	load_sub(*trk);
+	obj.tracks[art_nr]=trk.release();
 }
 
 } // namespace Marklin