Remove unsed (and removed from db) 'days' column fro xml parser and all sql parts.

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index 77cf596fd91c732913106edbe8764325cba18448..655e5f210ea6ff2d4886e6d40173d7422c784550 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -28,7 +28,6 @@ QSqlRecord const Conference::sColumns = Conference::toRecord(QList<QSqlField>()
     << QSqlField("city", QVariant::String)
     << QSqlField("start", QVariant::DateTime)
     << QSqlField("end", QVariant::DateTime)
     << QSqlField("city", QVariant::String)
     << QSqlField("start", QVariant::DateTime)
     << QSqlField("end", QVariant::DateTime)

-    << QSqlField("days", QVariant::Int)

     << QSqlField("day_change", QVariant::Int)
     << QSqlField("timeslot_duration", QVariant::Int)
     << QSqlField("active", QVariant::Bool)
     << QSqlField("day_change", QVariant::Int)
     << QSqlField("timeslot_duration", QVariant::Int)
     << QSqlField("active", QVariant::Bool)

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index fbb3a18806cca51e4df3b86c2a48236768396025..1b3157f4340cec346d51ffb383c7a2893bc7a59b 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -45,7 +45,6 @@ public:
     QString city() const { return value("city").toString(); }
     QDate start() const { return value("start").toDate(); }
     QDate end() const { return value("end").toDate(); }
     QString city() const { return value("city").toString(); }
     QDate start() const { return value("start").toDate(); }
     QDate end() const { return value("end").toDate(); }

-    int days() const { return value("days").toInt(); }

     int dayChange() const { return value("day_change").toInt(); } // in seconds from 00:00
     int timeslotDuration() const { return value("timeslot_duration").toInt(); } // in seconds
     bool isActive() const { return value("active").toBool(); }
     int dayChange() const { return value("day_change").toInt(); } // in seconds from 00:00
     int timeslotDuration() const { return value("timeslot_duration").toInt(); } // in seconds
     bool isActive() const { return value("active").toBool(); }

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 6e6d653d02d36d7de2d96c0c315351fa3608d171..e4a40f62a6f1a3fbca251ed08cc1b8a3666b2cbd 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -61,7 +61,6 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url, i
             conference["city"] = conferenceElement.firstChildElement("city").text();
             conference["start"] = conferenceElement.firstChildElement("start").text(); // date
             conference["end"] = conferenceElement.firstChildElement("end").text(); // date
             conference["city"] = conferenceElement.firstChildElement("city").text();
             conference["start"] = conferenceElement.firstChildElement("start").text(); // date
             conference["end"] = conferenceElement.firstChildElement("end").text(); // date

-            conference["days"] = conferenceElement.firstChildElement("days").text(); // int

             conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;
             conference["day_change"] = conferenceElement.firstChildElement("day_change").text(); // time
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             conference["url"] = url;

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index c06774551a76ad09ee741075172e386bc478faee..82448611501a553bc6f578d85dff37e041871b59 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -130,11 +130,11 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
     QSqlQuery query(db);
     if (conferenceId <= 0) // insert conference
     {
     QSqlQuery query(db);
     if (conferenceId <= 0) // insert conference
     {

-        query.prepare("INSERT INTO CONFERENCE (title,url,subtitle,venue,city,start,end,days,"
+        query.prepare("INSERT INTO CONFERENCE (title,url,subtitle,venue,city,start,end,"

                                                 "day_change,timeslot_duration,active) "
                                                 "day_change,timeslot_duration,active) "

-                        " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,:days,"
+                        " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,"

                                                 ":day_change,:timeslot_duration,:active)");
                                                 ":day_change,:timeslot_duration,:active)");

-        foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city" << "days")) {
+        foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {

             query.bindValue(QString(":") + prop_name, aConference[prop_name]);
         }
         query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
             query.bindValue(QString(":") + prop_name, aConference[prop_name]);
         }
         query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());


@@ -147,10 +147,10 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference, int confe
     }
     else // update conference
     {
     }
     else // update conference
     {

-        query.prepare("UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end, days=:days,"
+        query.prepare("UPDATE CONFERENCE set title=:title, url=:url, subtitle=:subtitle, venue=:venue, city=:city, start=:start, end=:end,"

                                             "day_change=:day_change, timeslot_duration=:timeslot_duration, active=:active "
                       "WHERE id=:id");
                                             "day_change=:day_change, timeslot_duration=:timeslot_duration, active=:active "
                       "WHERE id=:id");

-        foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city" << "days")) {
+        foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city")) {

             query.bindValue(QString(":") + prop_name, aConference[prop_name]);
         }
         query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
             query.bindValue(QString(":") + prop_name, aConference[prop_name]);
         }
         query.bindValue(":start", QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());