Split search keyword string on whitespace.

diff --git a/src/sql/sqlengine.cpp b/src/sql/sqlengine.cpp
index f11ead74ca04146cc246fabd00f7c64f8603e52a..9bd360909342bf142b9e528a1af52c9221e5ed85 100644 (file)
--- a/src/sql/sqlengine.cpp
+++ b/src/sql/sqlengine.cpp
@@ -313,9 +313,12 @@ int SqlEngine::searchEvent(int aConferenceId, const QHash<QString,QString> &aCol
     }
     sql += QString("WHERE EVENT.xid_conference = %1 AND (").arg( aConferenceId );
 
     }
     sql += QString("WHERE EVENT.xid_conference = %1 AND (").arg( aConferenceId );
 

+    QStringList searchKeywords = aKeyword.split(QRegExp("\\s+"));

     foreach (QString table, aColumns.uniqueKeys()){
         foreach (QString column, aColumns.values(table)){
     foreach (QString table, aColumns.uniqueKeys()){
         foreach (QString column, aColumns.values(table)){

-            sql += QString("%1.%2 LIKE '\%' || :%1%2 || '\%' OR ").arg( table, column );
+            for (int i=0; i < searchKeywords.count(); i++){
+                 sql += QString("%1.%2 LIKE '\%' || :%1%2 || '\%' OR ").arg( table, column );
+            }

         }
     }
     sql.chop( QString(" OR ").length() );
         }
     }
     sql.chop( QString(" OR ").length() );


@@ -325,7 +328,9 @@ int SqlEngine::searchEvent(int aConferenceId, const QHash<QString,QString> &aCol
     query.prepare(sql);
     foreach (QString table, aColumns.uniqueKeys()){
         foreach (QString column, aColumns.values(table)){
     query.prepare(sql);
     foreach (QString table, aColumns.uniqueKeys()){
         foreach (QString column, aColumns.values(table)){

-            query.bindValue(QString(":%1%2").arg(table, column), aKeyword );
+            foreach (QString keyword, searchKeywords){
+                query.bindValue(QString(":%1%2").arg(table, column), keyword );
+            }

         }
     }
 
         }
     }