Major code refactoring:

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

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index 3c8e279bcf354a957f05a418c2592538b3f97f67..00c27738cfb118a06040d626fe90064e036435cd 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -1,39 +1,37 @@
-#include <fstream>
-#include <msp/parser/parser.h>
+#include <msp/core/refptr.h>
+#include <msp/datafile/parser.h>
 #include "catalogue.h"
-#include "track.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;
+}
 
-       if(i!=tracks.end())
-               return i->second;
+TrackType &Catalogue::get_track(unsigned art_nr)
+{
+       map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
+       if(i==tracks.end())
+               throw KeyError("Unknown track 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)
@@ -43,21 +41,14 @@ Catalogue::Loader::Loader(Catalogue &c):
 
 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.insert(map<unsigned, TrackType *>::value_type(art_nr, trk.release()));
 }
 
 } // namespace Marklin