* Fixed performer facet

* Always use FileQuery which is much faster than normal queries

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

diff --git a/src/panels/filter/filterpanel.cpp b/src/panels/filter/filterpanel.cpp
index 5cfaa144d1877bda783b8d6e4d6414b099a2d8c8..021a2d3b8ec19b5360c702fb104789e63be5dac2 100644 (file)
--- a/src/panels/filter/filterpanel.cpp
+++ b/src/panels/filter/filterpanel.cpp
@@ -34,6 +34,7 @@
 #include <Nepomuk/Query/ComparisonTerm>
 #include <Nepomuk/Vocabulary/NFO>
 #include <Nepomuk/Vocabulary/NMM>
 #include <Nepomuk/Query/ComparisonTerm>
 #include <Nepomuk/Vocabulary/NFO>
 #include <Nepomuk/Vocabulary/NMM>

+#include <Nepomuk/Vocabulary/NIE>

 
 #include <kfileitem.h>
 #include <kio/jobclasses.h>
 
 #include <kfileitem.h>
 #include <kio/jobclasses.h>


@@ -108,7 +109,9 @@ void FilterPanel::showEvent(QShowEvent* event)
 
         // Artists
         Nepomuk::Utils::ProxyFacet* artistProxy = new Nepomuk::Utils::ProxyFacet();
 
         // Artists
         Nepomuk::Utils::ProxyFacet* artistProxy = new Nepomuk::Utils::ProxyFacet();

-        artistProxy->setFacetCondition(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Audio()));
+        artistProxy->setFacetCondition(Nepomuk::Query::ResourceTypeTerm(Nepomuk::Vocabulary::NFO::Audio()) ||
+                                       Nepomuk::Query::ComparisonTerm(Nepomuk::Vocabulary::NIE::mimeType(),
+                                                                      Nepomuk::Query::LiteralTerm(QLatin1String("audio"))));

         Nepomuk::Utils::DynamicResourceFacet* artistFacet = new Nepomuk::Utils::DynamicResourceFacet(artistProxy);
         artistFacet->setSelectionMode(Nepomuk::Utils::Facet::MatchAny);
         artistFacet->setRelation(Nepomuk::Vocabulary::NMM::performer());
         Nepomuk::Utils::DynamicResourceFacet* artistFacet = new Nepomuk::Utils::DynamicResourceFacet(artistProxy);
         artistFacet->setSelectionMode(Nepomuk::Utils::Facet::MatchAny);
         artistFacet->setRelation(Nepomuk::Vocabulary::NMM::performer());


@@ -162,7 +165,7 @@ void FilterPanel::slotSetUrlStatFinished(KJob* job)
 
 void FilterPanel::slotQueryTermChanged(const Nepomuk::Query::Term& term)
 {
 
 void FilterPanel::slotQueryTermChanged(const Nepomuk::Query::Term& term)
 {

-    Nepomuk::Query::Query query(m_unfacetedRestQuery && term);
+    Nepomuk::Query::FileQuery query(m_unfacetedRestQuery && term);

     emit urlActivated(query.toSearchUrl());
 }
 
     emit urlActivated(query.toSearchUrl());
 }