Add .pro.user.* to svn:ignore and remove it in the release target.

[toast/confclerk.git] / src / mvc / track.cpp

diff --git a/src/mvc/track.cpp b/src/mvc/track.cpp
index d0d8c1269260b5675ee4b1a6ef0989e71f7c7546..bb0bf3969a785e8557c2873ee7b155ae681ba61a 100644 (file)
--- a/src/mvc/track.cpp
+++ b/src/mvc/track.cpp
@@ -1,23 +1,35 @@
 /*
- * activity.cpp
+ * Copyright (C) 2010 Ixonos Plc.
+ * Copyright (C) 2011-2012 Philipp Spitzer, gregor herrmann, Stefan Stahl
  *
- *  Created on: Dec 27, 2009
- *      Author: Pavol Korinek
+ * This file is part of ConfClerk.
+ *
+ * ConfClerk is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * ConfClerk is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ConfClerk.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "track.h"
-#include <QSqlTableModel>
 
 QString const Track::sTableName = QString("track");
-int const Track::sTableColCount = 2;
+int const Track::sTableColCount = 3;
+const QString Track::CONFERENCEID = "xid_conference";
 const QString Track::NAME = "name";
 
 QSqlRecord const Track::sColumns = Track::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
+    << QSqlField(CONFERENCEID, QVariant::Int)
     << QSqlField(NAME, QVariant::String));
 
-//QMap<int, Track> Track::mIdToTrack;
-
 class TrackInsertException : OrmSqlException
 {
 public:
@@ -27,7 +39,7 @@ public:
 int Track::insert()
 {
     QSqlQuery query;
-    query.prepare("INSERT INTO " + sTableName + " (" + NAME + ")" + " VALUES " + "(\"" + name() + "\")");
+    query.prepare("INSERT INTO " + sTableName + " (" + CONFERENCEID + "," + NAME + ")" + " VALUES " + "(\"" + QString::number(conferenceid()) + "\",\"" + name() + "\")");
     if (!query.exec())
     {
         throw TrackInsertException("Exec Error");
@@ -39,12 +51,13 @@ int Track::insert()
         throw TrackInsertException("Last Insert Id Error");
 }
 
-Track Track::retrieveByName(QString name)
+Track Track::retrieveByName(int conferenceid, QString name)
 {
     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);
 }