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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/agents
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-09-18 8:49:31
Message-ID: 1253263771.326063.2824.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1025189 by vkrause:

- Fetch the full payload, we want to index the body as well.
- Fix deadlock, Soprano query iterators need to be closed before we can
  do a write operation.
- Only fetch stuff that's already in the cache.


 M  +4 -2      nepomuk_email_feeder/nepomukemailfeeder.cpp  
 M  +1 -0      nepomukfeeder/nepomukfeederagent.cpp  


--- trunk/KDE/kdepim/akonadi/agents/nepomuk_email_feeder/nepomukemailfeeder.cpp \
#1025188:1025189 @@ -57,7 +57,7 @@
   addSupportedMimeType( "message/rfc822" );
   addSupportedMimeType( "message/news" );
 
-  changeRecorder()->itemFetchScope().fetchPayloadPart( MessagePart::Envelope );
+  changeRecorder()->itemFetchScope().fetchFullPayload();
 
   mNrlModel = new Soprano::NRLModel( \
Nepomuk::ResourceManager::instance()->mainModel() );  }
@@ -170,7 +170,9 @@
                                                                      \
Soprano::Query::QueryLanguageSparql );  if ( it.next() ) {
     *found = true;
-    return NepomukFast::PersonContact( it.binding( 0 ).uri(), graphUri );
+    const QUrl uri = it.binding( 0 ).uri();
+    it.close();
+    return NepomukFast::PersonContact( uri, graphUri );
   }
   else {
     *found = false;
--- trunk/KDE/kdepim/akonadi/agents/nepomukfeeder/nepomukfeederagent.cpp \
#1025188:1025189 @@ -113,6 +113,7 @@
     if ( mMimeTypeChecker.isWantedCollection( collection ) ) {
       kDebug() << "fetching items from collection" << collection.name();
       ItemFetchJob *itemFetch = new ItemFetchJob( collection, this );
+      itemFetch->fetchScope().setCacheOnly( true );
       connect( itemFetch, SIGNAL(itemsReceived( Akonadi::Item::List)), \
SLOT(itemHeadersReceived(Akonadi::Item::List)) );  }
   }


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