Media image search is initially implemented.

diff --git a/src/db/dbmediaimagecontainer.cpp b/src/db/dbmediaimagecontainer.cpp
index dab5472..b09aea8 100644 (file)
--- a/src/db/dbmediaimagecontainer.cpp
+++ b/src/db/dbmediaimagecontainer.cpp
@@ -126,21 +126,19 @@ QString DbMediaImageContainer::constructSelect(QString whereClause) const
 {
     // TODO, for a usual search we need a "light" version of this select
     // and MediaImageContainer (only id, name)
-    /*
-        SELECT file.id, file.name, file.checksum, file.size,
-            filepath.id, filepath.name,
-            setup.id,
-            platform.id, platform.name,
-            mediatype.id, mediatype.name
-        FROM mediaimagecontainer
-        INNER JOIN file ON mediaimagecontainer.fileid = file.id
-        INNER JOIN filepath ON mediaimagecontainer.filepathid = filepath.id
-        INNER JOIN setup ON filepath.setupid = setup.id
-        INNER JOIN platform ON setup.platformid = platform.id
-        INNER JOIN mediatype ON setup.mediatypeid = mediatype.id
-        */
-    return "";
-    //return DbFile::constructSelect(whereClause);
+    return QString("SELECT file.id, file.name, file.checksum, file.size, "
+                "        filepath.id, filepath.name, "
+                "        setup.id, "
+                "        platform.id, platform.name, "
+                "        mediatype.id, mediatype.name "
+                "FROM mediaimagecontainer "
+                "INNER JOIN file ON mediaimagecontainer.fileid = file.id "
+                "INNER JOIN filepath ON mediaimagecontainer.filepathid = filepath.id "
+                "INNER JOIN setup ON filepath.setupid = setup.id "
+                "INNER JOIN platform ON setup.platformid = platform.id "
+                "INNER JOIN mediatype ON setup.mediatypeid = mediatype.id "
+                "%1 "
+                "ORDER BY file.name").arg(whereClause);
 }
 
 QString DbMediaImageContainer::constructFilterById(int id) const

diff --git a/src/db/dbquerymodelmanager.cpp b/src/db/dbquerymodelmanager.cpp
index 6a3535e..7769e65 100644 (file)
--- a/src/db/dbquerymodelmanager.cpp
+++ b/src/db/dbquerymodelmanager.cpp
@@ -47,7 +47,7 @@ QString DbQueryModelManager::constructWhereByFilters(QList<QString>filters)
     QString where = " WHERE ";
     int c = 0;
     foreach(QString filter, filters){
-        where.append(" %1 ").arg(filter);
+        where.append(QString(" %1 ").arg(filter));
         if (++c < filters.count())
             where.append(" AND ");
     }