Remove Strigi support.

As discussed during the KDE PIM sprint.

REVIEW: 113921

Author: vkrause

AkonadiConfig.cmake.in

@@ -11,7 +11,7 @@ set(AKONADI_VERSION @AKONADI_VERSION@)
 set(AKONADI_VERSION_STRING "@AKONADI_VERSION_STRING@")
 
 # set AKONADI_DEFINITIONS
-set(AKONADI_USE_STRIGI_SEARCH @AKONADI_USE_STRIGI_SEARCH@)
+set(AKONADI_USE_STRIGI_SEARCH FALSE) # backward compat, remove eventually
 set(AKONADI_DEFINITIONS "@AKONADI_DEFINITIONS@")
 
 # set the directories

CMakeLists.txt

@@ -18,7 +18,6 @@ include(CTest)
 include(CTestConfig.cmake)
 option(AKONADI_BUILD_TESTS "Build the Akonadi unit tests." TRUE)
 option(AKONADI_BUILD_QSQLITE "Build the Sqlite backend." TRUE)
-option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
 option(INSTALL_QSQLITE_IN_QT_PREFIX "Install the QSQLite plugin in QT_PLUGIN_DIR" FALSE)
 option(STATIC_LIBRARY "Build Akonadi as a static library." FALSE)
 option(QT5_BUILD "Build Akonadi using the Qt5 framework" FALSE)
@@ -31,14 +30,6 @@ if(AKONADI_BUILD_TESTS)
   enable_testing()
 endif()
 
-if(AKONADI_USE_STRIGI_SEARCH)
-  set(AKONADI_DEFINITIONS "-DAKONADI_USE_STRIGI_SEARCH")
-  add_definitions(${AKONADI_DEFINITIONS})
-  set(SOPRANO_TYPE "OPTIONAL")
-else()
-  set(SOPRANO_TYPE "REQUIRED")
-endif()
-
 ############### CMake Macros ###############
 
 include(InstallSettings)
@@ -168,7 +159,7 @@ endif()
 set_package_properties(Soprano PROPERTIES
                        URL "http://soprano.sourceforge.net"
                        DESCRIPTION "Storage of semantic data"
-                       TYPE ${SOPRANO_TYPE}
+                       TYPE REQUIRED
                        PURPOSE "Soprano is needed for the Nepomuk search backend"
 )
 

INSTALL

@@ -31,7 +31,6 @@ The following options are available when running CMake:
 
 * AKONADI_BUILD_TESTS (Default: TRUE): Build the Akonadi unit tests
 * AKONADI_BUILD_QSQLITE (Default: TRUE): Build the SQLite backend
-* AKONADI_USE_STRIGI_SEARCH (Default: FALSE): Only useful for certain cases (eg: WINCE builds), don't use it
 * INSTALL_QSQLITE_IN_QT_PREFIX (Default: FALSE): Useful for distributions.
   Once enabled, the qsqlite3 backend will be installed in ${QT_PLUGINS_DIR}/sqldrivers
 * STATIC_LIBRARY (Default: FALSE): Build the Akonadi server libraries statically. Only useful for certain cases (eg: WINCE builds).

interfaces/org.freedesktop.xesam.Search.xml

@@ -139,7 +139,6 @@ set(libakonadiprivate_SRCS
   src/handler/transaction.cpp
   src/search/agentsearchengine.cpp
   src/search/searchmanager.cpp
-  src/search/xesamsearchengine.cpp
 
   src/storage/collectionqueryhelper.cpp
   src/storage/entity.cpp
@@ -181,7 +180,6 @@ set(libakonadiprivate_SRCS
   src/notificationsource.cpp
   src/resourcemanager.cpp
   src/cachecleaner.cpp
-  src/xesamsearch.cpp
   src/debuginterface.cpp
   src/imapstreamparser.cpp
   src/preprocessorinstance.cpp
@@ -222,12 +220,6 @@ qt4_add_dbus_interfaces(libakonadiprivate_SRCS ${Akonadi_SOURCE_DIR}/interfaces/
 qt4_add_dbus_interface(libakonadiprivate_SRCS ${Akonadi_SOURCE_DIR}/interfaces/org.freedesktop.Akonadi.Preprocessor.xml preprocessorinterface)
 qt4_add_dbus_interface(libakonadiprivate_SRCS ${Akonadi_SOURCE_DIR}/interfaces/org.freedesktop.Akonadi.Agent.Control.xml agentcontrolinterface)
 
-set(xesam_xml ${Akonadi_SOURCE_DIR}/interfaces/org.freedesktop.xesam.Search.xml)
-
-set_source_files_properties(${xesam_xml} PROPERTIES INCLUDE "xesamtypes.h")
-
-qt4_add_dbus_interface(libakonadiprivate_SRCS ${xesam_xml} xesaminterface)
-
 qt4_add_resources(libakonadiprivate_SRCS src/storage/akonadidb.qrc)
 
 

server/CMakeLists.txt

@@ -37,7 +37,6 @@
 #include "storage/itemretrievalthread.h"
 #include "preprocessormanager.h"
 #include "search/searchmanager.h"
-#include "xesamtypes.h"
 #include "response.h"
 
 #include "libs/xdgbasedirs_p.h"
@@ -199,12 +198,7 @@ void AkonadiServer::init()
     mItemRetrievalThread->start( QThread::HighPriority );
 
     const QStringList searchManagers = settings.value( QLatin1String( "Search/Manager" ),
-                                                       QStringList()
-#ifdef AKONADI_USE_STRIGI_SEARCH
-                                                                     << QLatin1String( "Xesam" )
-#else
-                                                                     << QLatin1String( "Nepomuk" )
-#endif
+                                                       QStringList() << QLatin1String( "Nepomuk" )
                                                                      << QLatin1String( "Agent" ) ).toStringList();
     mSearchManager = new SearchManager( searchManagers, this );
 
@@ -230,8 +224,6 @@ void AkonadiServer::init()
     // operation was interrupted...
     db->unhideAllPimItems();
 
-    qDBusRegisterMetaType<XesamVariantListVector>();
-
     // We are ready, now register org.freedesktop.Akonadi service to DBus and
     // the fun can begin
     if ( !QDBusConnection::sessionBus().registerService( AkDBus::serviceName( AkDBus::Server ) ) ) {

server/src/akonadi.cpp

@@ -26,7 +26,6 @@
 #include "imapstreamparser.h"
 #include "nepomuksearch.h"
 #include "response.h"
-#include "xesamsearch.h"
 
 #include <libs/protocol_p.h>
 
@@ -50,15 +49,9 @@ bool Search::parseStream()
     return failureResponse( "No query specified" );
   }
 
-#ifdef AKONADI_USE_STRIGI_SEARCH
-  XesamSearch *service = new XesamSearch;
-  const QStringList uids = service->search( QString::fromUtf8( queryString ) );
-  delete service;
-#else
   NepomukSearch *service = new NepomukSearch;
   const QStringList uids = service->search( QString::fromUtf8( queryString ) );
   delete service;
-#endif
 
   if ( uids.isEmpty() ) {
     m_streamParser->readUntilCommandEnd(); // skip the fetch scope

server/src/handler/search.cpp

@@ -62,11 +62,7 @@ bool SearchPersistent::parseStream()
   }
 
   // for legacy clients we have to guess the language
-#ifdef AKONADI_USE_STRIGI_SEARCH
-  QString lang = QLatin1String( "XESAM" );
-#else
   QString lang = QLatin1String( "SPARQL" );
-#endif
 
   if ( m_streamParser->hasList() ) {
     m_streamParser->beginList();

server/src/handler/searchpersistent.cpp

@@ -23,7 +23,6 @@
 #include "agentsearchengine.h"
 #include "nepomuksearchengine.h"
 #include "entities.h"
-#include "xesamsearchengine.h"
 #include <storage/notificationcollector.h>
 
 using namespace Akonadi;
@@ -50,8 +49,6 @@ SearchManager::SearchManager( const QStringList &searchEngines, QObject *parent
 #endif
     } else if ( engineName == QLatin1String( "Agent" ) ) {
       m_engines.append( new AgentSearchEngine );
-    } else if ( engineName == QLatin1String( "Xesam" ) ) {
-      m_engines.append( new XesamSearchEngine );
     } else {
       akError() << "Unknown search engine type: " << engineName;
     }