[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/nepomuk/services/queryservice
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-06-16 14:57:53
Message-ID: 20100616145753.6D812AC8D4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1138714 by trueg:

Use Resource::fromResourceUri for faster result creation.

 M  +8 -9      searchthread.cpp  
 M  +2 -2      searchthread.h  


--- trunk/KDE/kdebase/runtime/nepomuk/services/queryservice/searchthread.cpp \
#1138713:1138714 @@ -106,19 +106,19 @@
     // created via the Nepomuk query API.
     //
     if ( m_sparqlQuery.endsWith( QLatin1String( "}" ) ) ) {
-        sparqlQuery( m_sparqlQuery + QLatin1String( " LIMIT 10" ), 1.0 );
+        sparqlQuery( m_sparqlQuery + QLatin1String( " LIMIT 10" ) );
         if ( !m_canceled && m_resultCnt >= 10 )
-            sparqlQuery( m_sparqlQuery + QLatin1String( " OFFSET 10" ), 1.0 );
+            sparqlQuery( m_sparqlQuery + QLatin1String( " OFFSET 10" ) );
     }
     else {
-        sparqlQuery( m_sparqlQuery, 1.0 );
+        sparqlQuery( m_sparqlQuery );
     }
 
     kDebug() << time.elapsed();
 }
 
 
-void Nepomuk::Query::SearchThread::sparqlQuery( const QString& query, double \
baseScore ) +void Nepomuk::Query::SearchThread::sparqlQuery( const QString& query )
 {
     kDebug() << query;
 
@@ -128,12 +128,11 @@
 
         ++m_resultCnt;
 
-        Resource res( hits[0].uri() );
+        Resource res = Resource::fromResourceUri( hits[0].uri() );
         if ( !res.hasType( Soprano::Vocabulary::RDFS::Class() ) &&
              !res.hasType( Soprano::Vocabulary::RDF::Property() ) &&
              !res.hasType( Soprano::Vocabulary::NRL::Graph() ) ) {
-            Result result = extractResult( hits );
-            result.setScore( result.score() * baseScore );
+            Result result = extractResult( res, hits );
 
             kDebug() << "Found result:" << result.resource().resourceUri() << \
result.score();  
@@ -143,10 +142,10 @@
 }
 
 
-Nepomuk::Query::Result Nepomuk::Query::SearchThread::extractResult( const \
Soprano::QueryResultIterator& it ) const +Nepomuk::Query::Result \
Nepomuk::Query::SearchThread::extractResult( const Resource& resultResource, const \
Soprano::QueryResultIterator& it ) const  {
     kDebug() << it.binding( 0 ).uri();
-    Result result( it.binding( 0 ).uri() );
+    Result result( resultResource );
 
     // make sure we do not store values twice
     QStringList names = it.bindingNames();
--- trunk/KDE/kdebase/runtime/nepomuk/services/queryservice/searchthread.h \
#1138713:1138714 @@ -59,8 +59,8 @@
             void run();
 
         private:
-            void sparqlQuery( const QString& query, double baseScore );
-            Nepomuk::Query::Result extractResult( const \
Soprano::QueryResultIterator& it ) const; +            void sparqlQuery( const \
QString& query ); +            Nepomuk::Query::Result extractResult( const Resource& \
resultResource, const Soprano::QueryResultIterator& it ) const;  
             QString m_sparqlQuery;
             RequestPropertyMap m_requestProperties;


[prev in list] [next in list] [prev in thread] [next in thread]