Code reformatting: add spaces around assignment operators

[r2c2.git] / source / libmarklin / catalogue.cpp

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 00c27738cfb118a06040d626fe90064e036435cd..689ad3b09c79e47e4db70e3ea5af8a2fa40a3f96 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,6 +1,14 @@
+/* $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 "locotype.h"
 #include "tracktype.h"
 
 using namespace std;
@@ -14,7 +22,7 @@ Catalogue::~Catalogue()
                delete i->second;
 }
 
-TrackType &Catalogue::get_track(unsigned art_nr)
+TrackType &Catalogue::get_track(unsigned art_nr) const
 {
        map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
        if(i==tracks.end())
@@ -23,32 +31,41 @@ TrackType &Catalogue::get_track(unsigned art_nr)
        return *i->second;
 }
 
-void Catalogue::load(const string &fn)
+LocoType &Catalogue::get_locomotive(unsigned art_nr) const
 {
-       IO::File in(fn.c_str());
+       map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
+       if(i==locos.end())
+               throw KeyError("Unknown locomotive type");
 
-       DataFile::Parser parser(in, fn);
-       Loader loader(*this);
-       loader.load(parser);
+       return *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)
 {
-       map<unsigned, TrackType *>::iterator i=cat.tracks.find(art_no);
-       if(i!=cat.tracks.end())
+       if(obj.tracks.count(art_nr))
                throw Exception("Duplicate track number");
 
-       RefPtr<TrackType> trk=new TrackType(art_no);
+       RefPtr<TrackType> trk = new TrackType(art_nr);
        load_sub(*trk);
-       unsigned art_nr=trk->get_article_number();
-       cat.tracks.insert(map<unsigned, TrackType *>::value_type(art_nr, trk.release()));
+       obj.tracks[art_nr] = trk.release();
 }
 
 } // namespace Marklin