← Back to branch summary

~ubuntu-branches/ubuntu/vivid/akonadi/vivid

« back to all changes in this revision

Viewing changes to server/src/search/xesamsearchengine.cpp

  • Committer: Package Import Robot
  • Author(s): Rohan Garg, Rohan Garg, Philip Muškovac
  • Date: 2013-06-13 08:46:15 UTC
  • mfrom: (1.1.42)
  • Revision ID: package-import@ubuntu.com-20130613084615-e37v5pdoe2p2xu9d
Tags: 1.9.80-0ubuntu1
[ Rohan Garg ]
* New upstream release
  - Update symbols
  - Install asapcat with akonadi-server for now
  - Install notificationmessagev2_p.h with -dev package
  - Refresh disable_dbus_requiring_tests.diff

[ Philip Muškovac ]
* libkonadi-dev needs to depend on akonadi-server for the dbus service 

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/src/search/xesamsearchengine.cpp
125
125
  akDebug() << "GetHits returned:" << results.count();
126
126
 
127
127
  typedef QList<QVariant> VariantList;
 
128
  PimItem::List toLink;
128
129
  Q_FOREACH ( const VariantList &list, results ) {
129
130
    if ( list.isEmpty() )
130
131
      continue;
137
138
    const PimItem item = PimItem::retrieveById( itemId );
138
139
    if ( item.isValid() ) {
139
140
      Entity::addToRelation<CollectionPimItemRelation>( collectionId, itemId );
140
 
      mCollector->itemLinked( item, collection );
 
141
      toLink << item;
141
142
    } else {
142
143
      akDebug() << "Non-existing item referenced in XESAM search. Discarding id:" << itemId;
143
144
    }
144
145
  }
145
 
 
 
146
  mCollector->itemsLinked( toLink, collection );
146
147
  mCollector->dispatchNotifications();
147
148
}
148
149
 
158
159
 
159
160
  const QVector<QList<QVariant> > results = mInterface->GetHitData( search, hits, QStringList( QLatin1String( "uri" ) ) );
160
161
  typedef QList<QVariant> VariantList;
 
162
  PimItem::List toUnlink;
161
163
  Q_FOREACH ( const VariantList &list, results ) {
162
164
    if ( list.isEmpty() )
163
165
      continue;
167
169
      continue;
168
170
 
169
171
    Entity::removeFromRelation<CollectionPimItemRelation>( collectionId, itemId );
170
 
    mCollector->itemUnlinked( PimItem::retrieveById( itemId ), collection );
 
172
    toUnlink << PimItem::retrieveById( itemId );
171
173
  }
172
 
 
 
174
  mCollector->itemsUnlinked( toUnlink, collection );
173
175
  mCollector->dispatchNotifications();
174
176
}
175
177