Kolab Groupware OBS

_service:set_version:akonadi.spec Changed

_service:recompress:tar_scm:akonadi-1.12.42.99.git20160513.7023638.tar.gz/.arcconfig Added

_service:recompress:tar_scm:akonadi-1.12.42.99.git20160503.b551a07.tar.gz/CMakeLists.txt -> _service:recompress:tar_scm:akonadi-1.12.42.99.git20160513.7023638.tar.gz/CMakeLists.txt Changed

_service:recompress:tar_scm:akonadi-1.12.42.99.git20160503.b551a07.tar.gz/server/src/search/searchmanager.cpp -> _service:recompress:tar_scm:akonadi-1.12.42.99.git20160513.7023638.tar.gz/server/src/search/searchmanager.cpp Changed

@@ -400,13 +400,33 @@
   }
 
   QVariantList newMatchesVariant;
-  Q_FOREACH ( qint64 id, newMatches ) {
-    newMatchesVariant << id;
-    Collection::addPimItem( collection.id(), id );
+  {
+      QVariantList _nm;
+      Q_FOREACH( qint64 id, newMatches ) {
+          _nm << id;
+      }
+  
+      if ( _nm.size() > 0 ) {
+          SelectQueryBuilder<PimItem> qb;
+          qb.addValueCondition( PimItem::idFullColumnName(), Query::In, _nm );
+          if ( !qb.exec() ) {
+              return;
+          }
+          const QVector<PimItem> newItems = qb.result();
+          QSet<qint64> newIDs;
+          Q_FOREACH ( const PimItem &item, newItems ) {
+              newMatchesVariant << item.id();
+              newIDs << item.id();
+              Collection::addPimItem( collection.id(), item.id() );
+          }
+          qDebug() << "Added" << newItems.count();
+          newMatches = newMatches - newIDs;
+      }
+      if (!newMatches.isEmpty()) {
+          akDebug() << "Could not add items to search collection, because their item do not exist anymore in PimItem table:" << newMatches;
+      }
   }
 
-  qDebug() << "Added" << newMatches.count();
-
   if ( !existingTransaction && !DataStore::self()->commitTransaction() ) {
     akDebug() << "Failed to commit transaction";
     return;

_service:set_version:akonadi.dsc Changed

Changes of Revision 25