Changeset cec47c6 for src

Timestamp:

05/05/10 15:56:14 (12 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

58eb7cc

Parents:

3cdaf7d

Message:

store path to conference map in database

path stored as additional field in conference table
if it's null or empty, "Show map" button is not shown
if existing database does not have the field, it will be automatically added

Location:

src

Files:

• fosdem.sql (modified) (1 diff)
• gui/conferenceeditor.cpp (modified) (3 diffs)
• mvc/conference.cpp (modified) (1 diff)
• mvc/conference.h (modified) (2 diffs)
• sql/sqlengine.cpp (modified) (2 diffs)
• sql/sqlengine.h (modified) (1 diff)

src/fosdem.sql

@@ -11 +11 @@
     , timeslot_duration INTEGER
     , 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");
+    , url VARCHAR UNIQUE
+    , map VARCHAR);
+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", ":/maps/campus.png");
 CREATE TABLE TRACK ( id INTEGER  PRIMARY KEY AUTOINCREMENT  NOT NULL
     , name VARCHAR UNIQUE NOT NULL );

src/gui/conferenceeditor.cpp

@@ -22 +22 @@
 #include "urlinputdialog.h"
 #include "mapwindow.h"
+#include "errormessage.h"
 
 #include <QInputDialog>
@@ -95 +96 @@
                 + ", " +
                 conf.end().toString("dd-MM-yyyy"));
+
+        QString map = conf.map();
+        if (map.isEmpty()) {
+            showMapButton->hide();
+        } else {
+            showMapButton->show();
+        }
+
         conferenceInfo->setCurrentIndex(0);
         removeBtn->show();
@@ -213 +222 @@
 void ConferenceEditor::conferenceMapClicked()
 {
-    QString mapPath = QString(":/maps/campus.png");
-    if(!QFile::exists(mapPath))
-        mapPath = QString(":/maps/rooms/not-available.png");
+    Conference conf = Conference::getById(selected_id);
+    QString mapPath = conf.map();
+    if(mapPath.isEmpty() or !QFile::exists(mapPath)) {
+        error_message("Map is not available");
+        return;
+    }
 
     QString roomName;

src/mvc/conference.cpp

@@ -32 +32 @@
     << QSqlField("timeslot_duration", QVariant::Int)
     << QSqlField("active", QVariant::Bool)
-    << QSqlField("url", QVariant::String));
+    << QSqlField("url", QVariant::String)
+    << QSqlField("map", QVariant::String)
+    );
 
 QString const Conference::sTableName = QString("conference");

src/mvc/conference.h

@@ -50 +50 @@
     int timeslotDuration() const { return value("timeslot_duration").toInt(); } // in seconds
     bool isActive() const { return value("active").toBool(); }
-    QString url() const
-    {
-        QVariant val = value("url");
-        qDebug() << __PRETTY_FUNCTION__ << val;
-        if (val.isValid()) {
-            return val.toString();
-        } else {
-            return QString();
-        }
-    }
+    QString url() const { return stringFromNullable(value("url")); }
+    QString map() const { return stringFromNullable(value("map")); }
 
     #if 0
@@ -79 +71 @@
         update("url");
     }
+
+private:
+    static QString stringFromNullable(const QVariant& v)
+    {
+        if (v.isValid()) {
+            return v.toString();
+        } else {
+            return QString();
+        }
+    }
 };
 

src/sql/sqlengine.cpp

@@ -62 +62 @@
         database.open();
     }
+
+    checkConferenceMap(database);
 
     //LOG_INFO(QString("Opening '%1' database '%2'").arg(aDatabaseType).arg(aDatabaseName));
@@ -378 +380 @@
 }
 
+void SqlEngine::checkConferenceMap(QSqlDatabase &aDatabase)
+{
+    QSqlQuery sqlQuery(aDatabase);
+    sqlQuery.prepare("SELECT map FROM conference");
+    if (!sqlQuery.exec()) {
+        qWarning() << "column conference.map is missing; adding";
+        execQuery(aDatabase, "ALTER TABLE conference ADD COLUMN map VARCHAR")
+         and execQuery(aDatabase, "UPDATE conference SET map = ':/maps/campus.png' WHERE title = 'FOSDEM 2010'");
+    }
+}

src/sql/sqlengine.h

@@ -48 +48 @@
         static bool execQuery(QSqlDatabase &aDatabase, const QString &aQuery);
         static bool execQueryWithParameter(QSqlDatabase &aDatabase, const QString &aQuery, const QHash<QString, QVariant>& params);
+
+        static void checkConferenceMap(QSqlDatabase &aDatabase);
 };