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

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 3c8e279..3ab96a9 100644
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,63 +1,77 @@
-#include <fstream>
-#include <msp/parser/parser.h>
+#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()
+{
+	for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		delete i->second;
+}
+
+TrackType &Catalogue::get_track(unsigned art_nr) const
 {
-	TrackMap::const_iterator i=tracks.find(art_nr);
+	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)
 {
+	add("locomotive", &Loader::locomotive);
 	add("track", &Loader::track);
 }
 
+void Catalogue::Loader::locomotive(unsigned art_no)
+{
+	map<unsigned, LocoType *>::iterator i=cat.locos.find(art_no);
+	if(i!=cat.locos.end())
+		throw Exception("Duplicate locomotive number");
+
+	RefPtr<LocoType> loco=new LocoType(art_no);
+	load_sub(*loco);
+	unsigned art_nr=loco->get_article_number();
+	cat.locos[art_nr]=loco.release();
+}
+
 void Catalogue::Loader::track(unsigned art_no)
 {
-	TrackMap::iterator i=cat.tracks.find(art_no);
+	map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
 	if(i!=cat.tracks.end())
 		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_no);
+	load_sub(*trk);
+	unsigned art_nr=trk->get_article_number();
+	cat.tracks[art_nr]=trk.release();
 }
 
 } // namespace Marklin