Changeset 525e2e2 in confclerk_git for src/sql

Timestamp:

07/12/11 22:16:12 (12 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

fdf4d9c

Parents:

0ea5709

Message:

This commit closes ticket #12. The search terms are ANDed now and a call to trimmed() before splitting the search string avoids problems with leading/trailing spaces.

File:

• src/sql/sqlengine.cpp (modified) (1 diff)

src/sql/sqlengine.cpp

@@ -314 +314 @@
     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)){
-            for (int i=0; i < searchKeywords.count(); i++){
-                 sql += QString("%1.%2 LIKE '\%' || :%1%2%3 || '\%' OR ").arg(table).arg(column).arg(i);
-            }
-        }
-    }
-    sql.chop( QString(" OR ").length() );
+    QStringList searchKeywords = aKeyword.trimmed().split(QRegExp("\\s+"));
+    QStringList whereAnd;
+    for (int i=0; i < searchKeywords.count(); i++) {
+        QStringList whereOr;
+        foreach (QString table, aColumns.uniqueKeys()) {
+            foreach (QString column, aColumns.values(table)){
+                 whereOr.append(QString("%1.%2 LIKE '\%' || :%1%2%3 || '\%'").arg(table).arg(column).arg(i));
+            }
+        }
+        whereAnd.append(whereOr.join(" OR "));
+    }
+    sql += whereAnd.join(") AND (");
     sql += QString(")");
 
     QSqlQuery query(db);
     query.prepare(sql);
-    foreach (QString table, aColumns.uniqueKeys()){
-        foreach (QString column, aColumns.values(table)){
-            for (int i = 0; i != searchKeywords.size(); ++i) {
-                QString keyword = searchKeywords[i];
+    for (int i = 0; i != searchKeywords.size(); ++i) {
+        QString keyword = searchKeywords[i];
+        foreach (QString table, aColumns.uniqueKeys()) {
+            foreach (QString column, aColumns.values(table)) {
                 query.bindValue(QString(":%1%2%3").arg(table).arg(column).arg(i), keyword );
             }