Changeset c7b58d4 in confclerk_git for src/gui/mainwindow.cpp

Timestamp:

01/25/10 14:05:23 (13 years ago)

Author:

timkoma <timkoma@…>

Branches:

master, qt5

Children:

1deea3b

Parents:

7620de0

Message:

search upgrade

File:

• src/gui/mainwindow.cpp (modified) (3 diffs)

src/gui/mainwindow.cpp

@@ -247 +247 @@
 void MainWindow::updateSearchView(const QDate &aDate)
 {
-/*
+    qDebug() << "MainWindow::updateSearchView(), aDate: " << aDate.toString() ;
     searchTreeView->reset();
     int eventsCount = static_cast<EventModel*>(searchTreeView->model())->loadSearchResultEvents(aDate,AppSettings::confId());
-    if( eventsCount ){
+    if( eventsCount ||
+            searchDayNavigator->getCurrentDate() != Conference::getById(AppSettings::confId()).start() ){
         searchVerticalWidget->show();
         searchAgainButton->show();
@@ -261 +262 @@
         searchHead->show();
     }
-*/
 }
 
@@ -312 +312 @@
 void MainWindow::searchClicked()
 {
-    QList<QString> columns;
+    QHash<QString,QString> columns;
 
     if( searchTitle->isChecked() )
-        columns.append( "title" );
+        columns.insertMulti("EVENT", "title");
     if( searchAbstract->isChecked() )
-        columns.append( "abstract" );
-
-    mSqlEngine->searchEvent( AppSettings::confId(), columns, searchEdit->text() );
+        columns.insertMulti("EVENT", "abstract");
+    if( searchTag->isChecked() )
+        columns.insertMulti("EVENT", "tag");
+    if( searchSpeaker->isChecked() )
+        columns["PERSON"] = "name";
+    if( searchRoom->isChecked() )
+        columns["ROOM"] = "name";
+
+    QString keyword = searchEdit->text().replace( QString("%"), QString("\\%") );
+    qDebug() << "\nKeyword to search: " << keyword;
+    mSqlEngine->searchEvent( AppSettings::confId(), columns, keyword );
+
     updateSearchView( Conference::getById(AppSettings::confId()).start() );
 }