Fixed custom query integration.

CCMAIL: peter.penz@gmx.at

svn path=/trunk/KDE/kdebase/apps/; revision=1059964

diff --git a/src/search/dolphinsearchoptionsconfigurator.cpp b/src/search/dolphinsearchoptionsconfigurator.cpp
index ec1c30a82aa9b230fa1b3d5b6281d14f4c001df1..0c905f3af4346a23608cdc0f7bc331bd87144ff5 100644 (file)
--- a/src/search/dolphinsearchoptionsconfigurator.cpp
+++ b/src/search/dolphinsearchoptionsconfigurator.cpp
@@ -25,6 +25,7 @@
 #define DISABLE_NEPOMUK_LEGACY
 #include <nepomuk/andterm.h>
 #include <nepomuk/query.h>
 #define DISABLE_NEPOMUK_LEGACY
 #include <nepomuk/andterm.h>
 #include <nepomuk/query.h>

+#include <nepomuk/queryparser.h>

 #include <nepomuk/term.h>
 
 #include <kcombobox.h>
 #include <nepomuk/term.h>
 
 #include <kcombobox.h>


@@ -193,7 +194,10 @@ KUrl DolphinSearchOptionsConfigurator::nepomukUrl() const
         query.setTerm(andTerm);
     }
 
         query.setTerm(andTerm);
     }
 

-    // TODO: respect m_customSearchQuery
+    Nepomuk::Query::Query customQuery = Nepomuk::Query::QueryParser::parseQuery( m_customSearchQuery );
+    if ( customQuery.isValid() ) {
+        query.setTerm( Nepomuk::Query::AndTerm( query.term(), customQuery.term() ) );
+    }

 
     return query.toSearchUrl();
 }
 
     return query.toSearchUrl();
 }