Tracks are inserted now when importing new conferences.

diff --git a/src/mvc/track.cpp b/src/mvc/track.cpp
index 9cadb47be481e6703ced6295c9769748b7818a54..545137836f9e12ad4db0634de3aa8383d4daaa37 100644 (file)
--- a/src/mvc/track.cpp
+++ b/src/mvc/track.cpp
@@ -50,12 +50,13 @@ int Track::insert()
         throw TrackInsertException("Last Insert Id Error");
 }
 
         throw TrackInsertException("Last Insert Id Error");
 }
 

-Track Track::retrieveByName(QString name)
+Track Track::retrieveByName(int conferenceid, QString name)

 {
     QSqlQuery query;
     query.prepare(
             selectQuery()
 {
     QSqlQuery query;
     query.prepare(
             selectQuery()

-            + QString("WHERE %1.name = :name").arg(sTableName));
+            + QString("WHERE %1.xid_conference = :xid_conference and %1.name = :name").arg(sTableName));
+    query.bindValue(":xid_conference", conferenceid);

     query.bindValue(":name", name);
     return loadOne(query);
 }
     query.bindValue(":name", name);
     return loadOne(query);
 }

diff --git a/src/mvc/track.h b/src/mvc/track.h
index 3173b87c69f665846a72d2478645ff70fd1faaf6..16a6b985cafa11dd199fbbe56560474b6f4a9c0b 100644 (file)
--- a/src/mvc/track.h
+++ b/src/mvc/track.h
@@ -42,7 +42,7 @@ public:
     static QList<Track> getAll();
     static Track retrieve(int id);
     static QString retrieveTrackName(int id);
     static QList<Track> getAll();
     static Track retrieve(int id);
     static QString retrieveTrackName(int id);

-    static Track retrieveByName(QString name);
+    static Track retrieveByName(int conferenceid, QString name);

 };
 
 #endif /* TRACK_H_ */
 };
 
 #endif /* TRACK_H_ */

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 56f44779adec3e3a77267d768afa1ebf245e7c3a..a846c077f35bf9c46cab523d606cd0ed75bd2cbe 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -140,7 +140,7 @@ void SqlEngine::addEventToDB(QHash<QString,QString> &aEvent)
         int trackId;
         try
         {
         int trackId;
         try
         {

-            track = Track::retrieveByName(name);
+            track = Track::retrieveByName(conference, name);

             trackId = track.id();
             /*qDebug() << QString("DEBUG: Track %1 in DB").arg(name);*/
         }
             trackId = track.id();
             /*qDebug() << QString("DEBUG: Track %1 in DB").arg(name);*/
         }