store URL's for conferences

* use it at update
* let user update the url before request

diff --git a/src/fosdem.sql b/src/fosdem.sql
index 7054fc0459663c2c0feb9c68b7c58a39cc332f4a..c2358dcd122515db231814eb95a4218a4b5aaf0f 100644 (file)
--- a/src/fosdem.sql
+++ b/src/fosdem.sql
@@ -9,8 +9,9 @@ CREATE TABLE CONFERENCE ( id INTEGER PRIMARY KEY  AUTOINCREMENT  NOT NULL
     , days INTEGER
     , day_change INTEGER
     , timeslot_duration INTEGER
-    , active INTEGER DEFAULT 0);
-INSERT INTO "CONFERENCE" VALUES(1,'FOSDEM 2010','Free and Opensource Software Developers European Meeting','ULB (Campus Solbosch)','Brussels',1265414400,1265500800,2,28800,900,1);
+    , active INTEGER DEFAULT 0
+    , url VARCHAR UNIQUE);
+INSERT INTO "CONFERENCE" VALUES(1,'FOSDEM 2010','Free and Opensource Software Developers European Meeting','ULB (Campus Solbosch)','Brussels',1265414400,1265500800,2,28800,900,1,"http://fosdem.org/2010/schedule/xml");
 CREATE TABLE TRACK ( id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL
     , name VARCHAR UNIQUE NOT NULL );
 INSERT INTO "TRACK" VALUES(1,'Keynotes');

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index a63d93ff061934608ff4f4d22d4ef1b5df1dba0d..e6f3e02c1b491898110f1d3f5cee5aa8055e790b 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -29,7 +29,12 @@
 #include <QDebug>
 #include <appsettings.h>
 
-const QString SCHEDULE_URL = "http://fosdem.org/2010/schedule/xml";
+// TODO: this is temporary
+#include <QInputDialog>
+
+#include "conference.h"
+
+// const QString SCHEDULE_URL = "http://fosdem.org/2010/schedule/xml";
 
 const QString PROXY_USERNAME;
 const QString PROXY_PASSWD;
@@ -90,7 +95,7 @@ void ImportScheduleWidget::browseSchedule()
             return;
         }
 
-        importData(file.readAll());
+        importData(file.readAll(), QString());
 
     }
     else
@@ -107,27 +112,50 @@ void ImportScheduleWidget::networkQueryFinished(QNetworkReply *aReply)
     }
     else
     {
-        importData(aReply->readAll());
+        importData(aReply->readAll(), aReply->url().toEncoded());
     }
 }
 
 void ImportScheduleWidget::downloadSchedule()
 {
     QNetworkRequest request;
-    request.setUrl(QUrl(SCHEDULE_URL));
+
+    // TODO: make a nicer GUI
+    // basically, you have to do the following things:
+    // 1. store schedule URL for each conteferce
+    // 2. allow refreshing of the current conference schedule with "1 button click"
+    // 3. allow changing of the URL for a conference;
+    //     run refresh together with it is ok and even justified by usability,
+    //     but it must not loose this change if refresh not available.
+    //     So it cannot be done as "do like #4 and rely on REPLACE".
+    // 4. allow getting the new conference by URL
+
+    QString url_default;
+    try {
+        url_default = Conference::getById(Conference::activeConference()).getUrl();
+    } catch (OrmException& e) {
+        qWarning() << "failed to get default URL:" << e.text();
+    }
+
+    bool ok = false;
+    QString url = QInputDialog::getText(this, "URL request", "Put proper schedule URL or let it try with it", QLineEdit::Normal, url_default, &ok);
+    if (!ok) { // cancel pressed
+        return;
+    }
+    request.setUrl(QUrl(url));
 
     mNetworkAccessManager->setProxy(QNetworkProxy::applicationProxy());
     mNetworkAccessManager->get(request);
 }
 
-void ImportScheduleWidget::importData(const QByteArray &aData)
+void ImportScheduleWidget::importData(const QByteArray &aData, const QString& url)
 {
     browse->hide();
     online->hide();
     progressBar->show();
     // proxySettings->hide();
 
-    int confId = mXmlParser->parseData(aData);
+    int confId = mXmlParser->parseData(aData, url);
 
     progressBar->hide();
     browse->show();

diff --git a/src/gui/importschedulewidget.h b/src/gui/importschedulewidget.h
index 6f25d22a94f04b6690150579a6fdf76f8ce01682..f0679214721ff0551d97272ed2a87984a169d955 100644 (file)
--- a/src/gui/importschedulewidget.h
+++ b/src/gui/importschedulewidget.h
@@ -41,7 +41,7 @@ class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
     signals:
         void scheduleImported(int confId);
     private:
-        void importData(const QByteArray &aData);
+        void importData(const QByteArray &aData, const QString& url);
     private:
         ScheduleXmlParser *mXmlParser;
         QNetworkAccessManager *mNetworkAccessManager;

diff --git a/src/mvc/conference.cpp b/src/mvc/conference.cpp
index b08a2480fe3a4166c91cccb648d7ec8e9d282fe9..23c4cc204c536418897f1efdb9f2691e124eb0d3 100644 (file)
--- a/src/mvc/conference.cpp
+++ b/src/mvc/conference.cpp
@@ -29,7 +29,8 @@ QSqlRecord const Conference::sColumns = Conference::toRecord(QList<QSqlField>()
     << QSqlField("days", QVariant::Int)
     << QSqlField("day_change", QVariant::Int)
     << QSqlField("timeslot_duration", QVariant::Int)
-    << QSqlField("active", QVariant::Bool));
+    << QSqlField("active", QVariant::Bool)
+    << QSqlField("url", QVariant::String));
 
 QString const Conference::sTableName = QString("conference");
 
@@ -57,6 +58,10 @@ int Conference::activeConference()
     while(query.next())
         activeConfs.append(query.record().value("id").toInt());
 
+    qDebug() << __PRETTY_FUNCTION__
+        << "activeConfs.count()" << activeConfs.count()
+        ;
+
     if(activeConfs.count()==0) // no active DB
         return 1;
     else // even if there are more active confs, the first from the list is confidered active

diff --git a/src/mvc/conference.h b/src/mvc/conference.h
index d8b9318d849836af99bc30278d8f3c717dc2eb37..26ea87bdcf7783e20f89ab2a1504ebcea711b15d 100644 (file)
--- a/src/mvc/conference.h
+++ b/src/mvc/conference.h
@@ -48,6 +48,16 @@ public:
     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(); }
+    QString getUrl() const
+    {
+        QVariant val = value("url");
+        qDebug() << __PRETTY_FUNCTION__ << val;
+        if (val.isValid()) {
+            return val.toString();
+        } else {
+            return QString();
+        }
+    }
 
     void setId(int id) { setValue("id", id); }
     void setTitle(const QString& title) { setValue("title", title); }
@@ -60,6 +70,7 @@ public:
     void setDayChange(int dayChange) { setValue("day_change", dayChange); }
     void setTimeslotDuration(int timeslotDuration) { setValue("timeslot_duration", timeslotDuration); }
     void setActive(bool active) { setValue("active", (int)((active))); }
+    void setUrl(const QString& url) { setValue("url", url.isNull() ? QVariant() : url); }
 };
 
 #endif /* CONFERENCE_H */

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 8ce0a6812850e47f7ae09dd15ee5946f19fee670..fb869ae5793a57eda26f55c564e9cc1dd0ca8bfa 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -30,7 +30,7 @@ ScheduleXmlParser::ScheduleXmlParser(QObject *aParent)
 {
 }
 
-int ScheduleXmlParser::parseData(const QByteArray &aData)
+int ScheduleXmlParser::parseData(const QByteArray &aData, const QString& url)
 {
     QDomDocument document;
     document.setContent (aData, false);
@@ -56,6 +56,7 @@ int ScheduleXmlParser::parseData(const QByteArray &aData)
             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;
             SqlEngine::addConferenceToDB(conference);
             confId = conference["id"].toInt();
             emit(parsingSchedule(conference["title"]));

diff --git a/src/sql/schedulexmlparser.h b/src/sql/schedulexmlparser.h
index bd324e186c9b90e5846cf686d09c6f14c4b1a7d7..147728f75bf144e7d86498f52ba26aef0cdd9858 100644 (file)
--- a/src/sql/schedulexmlparser.h
+++ b/src/sql/schedulexmlparser.h
@@ -28,7 +28,7 @@ class ScheduleXmlParser : public QObject
         ScheduleXmlParser (QObject *aParent = NULL);\r
 \r
     public slots:\r
-        int parseData(const QByteArray &aData); // returns 'confId' of parsed conference schedule\r
+        int parseData(const QByteArray &aData, const QString& url); // returns 'confId' of parsed conference schedule\r
 \r
     signals:\r
         void progressStatus(int aStatus);\r

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index 99049dfe0235f1998db09e52c5e225bc11ac299b..cc7122f94315b1d7698a4c963e603412efe7ffe1 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -101,21 +101,21 @@ void SqlEngine::addConferenceToDB(QHash<QString,QString> &aConference)
 
         if(!confId) // conference 'aConference' isn't in the table => insert
         {
-            QString values = QString("'%1', '%2', '%3', '%4', '%5', '%6', '%7', '%8', '%9'") \
-                             .arg(aConference["title"]) \
-                             .arg(aConference["subtitle"]) \
-                             .arg(aConference["venue"]) \
-                             .arg(aConference["city"]) \
-                             .arg(QDateTime(QDate::fromString(aConference["start"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t()) \
-                             .arg(QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t()) \
-                             .arg(aConference["days"]) \
-                             .arg(-QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0))) \
-                             .arg(-QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
-                             values.append(QString(", '%1'").arg(confsList.count()>0?"0":"1"));
-
-            QString query = QString("INSERT INTO CONFERENCE (title,subtitle,venue,city,start,end,days,day_change,timeslot_duration,active) VALUES (%1)").arg(values);
-            QSqlQuery result (query, db);
-            aConference["id"] = result.lastInsertId().toString(); // 'id' is assigned automatically
+            QSqlQuery query(db);
+            query.prepare("INSERT INTO CONFERENCE (title,url,subtitle,venue,city,start,end,days,"
+                                                    "day_change,timeslot_duration,active) "
+                            " VALUES (:title,:url,:subtitle,:venue,:city,:start,:end,:days,"
+                                                    ":day_change,:timeslot_duration,:active)");
+            foreach (QString prop_name, (QList<QString>() << "title" << "url" << "subtitle" << "venue" << "city" << "days")) {
+                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(":end", QDateTime(QDate::fromString(aConference["end"],DATE_FORMAT),QTime(0,0),Qt::UTC).toTime_t());
+            query.bindValue(":day_change", -QTime::fromString(aConference["day_change"],TIME_FORMAT).secsTo(QTime(0,0)));
+            query.bindValue(":day_change", -QTime::fromString(aConference["timeslot_duration"],TIME_FORMAT).secsTo(QTime(0,0)));
+            query.bindValue(":active", confsList.count() > 0 ? 0 : 1);
+            query.exec();
+            aConference["id"] = query.lastInsertId().toString(); // 'id' is assigned automatically
         }
     }
 }