← Back to branch summary

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

« back to all changes in this revision

Viewing changes to server/src/nepomuksearch.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/nepomuksearch.cpp
49
49
 
50
50
NepomukSearch::~NepomukSearch()
51
51
{
52
 
  if ( mSearchService ) {
53
 
    mSearchService->close();
54
 
    delete mSearchService;
55
 
  }
 
52
  mSearchService->close();
 
53
  delete mSearchService;
56
54
}
57
55
 
58
56
QStringList NepomukSearch::search( const QString &query )
59
57
{
60
58
  //qDebug() << Q_FUNC_INFO << query;
61
 
  if ( !mSearchService ) {
 
59
  if ( !mSearchService->serviceAvailable() ) {
62
60
    qWarning() << "Nepomuk search service not available!";
63
61
    return QStringList();
64
62
  }
70
68
  encodedRps.insert( QString::fromLatin1( "reqProp1" ), QUrl(QString::fromLatin1("http://akonadi-project.org/ontologies/aneo#akonadiItemId")).toString() );
71
69
 
72
70
  if ( !mSearchService->blockingQuery( query, encodedRps ) ) {
73
 
    qWarning() << Q_FUNC_INFO << "Calling blockingQuery() failed!";
 
71
    qWarning() << Q_FUNC_INFO << "Calling blockingQuery() failed!" << query;
74
72
    return QStringList();
75
73
  }
76
74
 
109
107
 
110
108
void NepomukSearch::hitsAdded( const QList<Nepomuk::Query::Result>& entries )
111
109
{
112
 
  if ( !mSearchService ) {
 
110
  if ( !mSearchService->serviceAvailable() ) {
113
111
    qWarning() << "Nepomuk search service not available!";
114
112
    return;
115
113
  }