[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [conquirere] /: make it compile against the nepomuk-webimer
From: Jörg_Ehrichs <Joerg.Ehrichs () gmx ! de>
Date: 2013-01-31 21:04:16
Message-ID: 20130131210416.5E8C5A60D4 () git ! kde ! org
[Download RAW message or body]
Git commit 6142a848c31abfefa6ab66b983f0ff21690dc75d by Jörg Ehrichs.
Committed on 31/01/2013 at 21:34.
Pushed by jehrichs into branch 'master'.
make it compile against the nepomuk-webimer
M +3 -3 CMakeLists.txt
D +0 -62 cmake/modules/FindNepomukMetadataExtractor.cmake
A +63 -0 cmake/modules/FindNepomukWebMiner.cmake
M +1 -2 src/CMakeLists.txt
M +4 -4 src/mainui/docklets/searchwidget.cpp
M +3 -3 src/mainui/docklets/searchwidget.h
M +4 -4 src/mainui/sidebar/searchresultinfowidget.cpp
M +2 -2 src/mainui/sidebar/searchresultinfowidget.h
M +2 -2 src/mainui/sidebar/sidebarwidget.cpp
M +1 -1 src/nbibio/CMakeLists.txt
M +2 -2 src/nbibio/bibtex/bibtexvariant.cpp
M +3 -3 src/nbibio/pipe/varianttonepomukpipe.cpp
M +0 -1 tests/Test-zotero.data/CMakeLists.txt
http://commits.kde.org/conquirere/6142a848c31abfefa6ab66b983f0ff21690dc75d
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d551cc2..7a881d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ find_package(NepomukCore REQUIRED)
find_package(QJSON REQUIRED)
#set(KBIBTEX_MIN_VERSION "0.6.0")
find_package(KBibTeX REQUIRED)
-find_package(NepomukMetadataExtractor REQUIRED)
+find_package(NepomukWebMiner REQUIRED)
include (NepomukAddOntologyClasses)
include (KDE4Defaults)
@@ -39,8 +39,8 @@ include_directories (
${NEPOMUK_INCLUDE_DIR}
${NEPOMUKEXTRAS_INCLUDE_DIR}
${KBIBTEX_INCLUDE_DIRS}
- ${NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS}
- \
${NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS}/nepomukmetadataextractor/ + \
${NEPOMUK_WEBMINER_INCLUDE_DIRS} + \
${NEPOMUK_WEBMINER_INCLUDE_DIRS}/nepomuk-webminer/
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
diff --git a/cmake/modules/FindNepomukMetadataExtractor.cmake \
b/cmake/modules/FindNepomukMetadataExtractor.cmake deleted file mode 100644
index 6a29fde..0000000
--- a/cmake/modules/FindNepomukMetadataExtractor.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-# CMake-Script to find Nepomuk-Metadata-Extractor
-# Once done this will define
-#
-# NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS - the kbibtex include directory
-# NEPOMUK_METADATA_EXTRACTOR_LIBS - Link this to use the kbibtex library
-# NEPOMUK_METADATA_EXTRACTOR_FOUND - True if found, otherwise false
-#
-# Copyright (c) 2012 Andreas Cord-Landwehr <cola@uni-paderborn.de>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if( NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS AND NEPOMUK_METADATA_EXTRACTOR_LIBS )
- # Already in cache, be silent
- set( NEPOMUK_METADATA_EXTRACTOR_FIND_QUIETLY TRUE )
-endif( NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS AND NEPOMUK_METADATA_EXTRACTOR_LIBS )
-
-find_library(
- NEPOMUK_METADATA_EXTRACTOR_LIB
- NAMES nepomukmetadataextractor
- HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}
-)
-
-find_path(
- NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS
- NAMES nepomukmetadataextractor_export.h
- HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR}
-)
-
-# added because on my system the above statement can't find the includes in its \
usual subdirectory
-if(NOT NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS)
- find_path(
- NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS
- NAMES nepomukmetadataextractor/nepomukmetadataextractor_export.h
- HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR}
- )
-endif(NOT NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS)
-
-if (NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS AND NEPOMUK_METADATA_EXTRACTOR_LIB )
- # in cache already
- set(NEPOMUK_METADATA_EXTRACTOR_FOUND TRUE)
- set(NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS \
${NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS})
- set(NEPOMUK_METADATA_EXTRACTOR_LIBS
- ${NEPOMUK_METADATA_EXTRACTOR_LIB}
- )
-endif(NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS AND NEPOMUK_METADATA_EXTRACTOR_LIB )
-
-if( NEPOMUK_METADATA_EXTRACTOR_FOUND )
- if( NOT NEPOMUK_METADATA_EXTRACTOR_FIND_QUIETLY )
- message( STATUS "Found Nepomuk Metadata Extractor libraries : \
${NEPOMUK_METADATA_EXTRACTOR_LIBS}" )
- endif( NOT NEPOMUK_METADATA_EXTRACTOR_FIND_QUIETLY )
-else( NEPOMUK_METADATA_EXTRACTOR_FOUND )
- if( LibNepomukMetadataExtractor_FIND_REQUIRED )
- message( FATAL_ERROR "Could not find Nepomuk Metadata Extractor libraries" )
- endif( LibNepomukMetadataExtractor_FIND_REQUIRED )
-endif( NEPOMUK_METADATA_EXTRACTOR_FOUND )
-
-
-mark_as_advanced(
- NEPOMUK_METADATA_EXTRACTOR_INCLUDE_DIRS
- NEPOMUK_INCLUDE_DIRS
-)
diff --git a/cmake/modules/FindNepomukWebMiner.cmake \
b/cmake/modules/FindNepomukWebMiner.cmake new file mode 100644
index 0000000..85635c9
--- /dev/null
+++ b/cmake/modules/FindNepomukWebMiner.cmake
@@ -0,0 +1,63 @@
+# CMake-Script to find Nepomuk-WebMiner
+# Once done this will define
+#
+# NEPOMUK_WEBMINER_INCLUDE_DIRS - the kbibtex include directory
+# NEPOMUK_WEBMINER_LIBS - Link this to use the kbibtex library
+# NEPOMUK_WEBMINER_FOUND - True if found, otherwise false
+#
+# Copyright (c) 2012 Andreas Cord-Landwehr <cola@uni-paderborn.de>
+# Copyright (c) 2013 Jörg Ehrichs <joerg.ehrichs@gmx.de>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if( NEPOMUK_WEBMINER_INCLUDE_DIRS AND NEPOMUK_WEBMINER_LIBS )
+ # Already in cache, be silent
+ set( NEPOMUK_WEBMINER_FIND_QUIETLY TRUE )
+endif( NEPOMUK_WEBMINER_INCLUDE_DIRS AND NEPOMUK_WEBMINER_LIBS )
+
+find_library(
+ NEPOMUK_WEBMINER_LIB
+ NAMES nepomuk-webminerlib
+ HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}
+)
+
+find_path(
+ NEPOMUK_WEBMINER_INCLUDE_DIRS
+ NAMES nepomukwebminer_export.h
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR}
+)
+
+# added because on my system the above statement can't find the includes in its \
usual subdirectory +if(NOT NEPOMUK_WEBMINER_INCLUDE_DIRS)
+ find_path(
+ NEPOMUK_WEBMINER_INCLUDE_DIRS
+ NAMES nepomuk-webminer/nepomukwebminer_export.h
+ HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR}
+ )
+endif(NOT NEPOMUK_WEBMINER_INCLUDE_DIRS)
+
+if (NEPOMUK_WEBMINER_INCLUDE_DIRS AND NEPOMUK_WEBMINER_LIB )
+ # in cache already
+ set(NEPOMUK_WEBMINER_FOUND TRUE)
+ set(NEPOMUK_WEBMINER_INCLUDE_DIRS ${NEPOMUK_WEBMINER_INCLUDE_DIRS})
+ set(NEPOMUK_WEBMINER_LIBS
+ ${NEPOMUK_WEBMINER_LIB}
+ )
+endif(NEPOMUK_WEBMINER_INCLUDE_DIRS AND NEPOMUK_WEBMINER_LIB )
+
+if( NEPOMUK_WEBMINER_FOUND )
+ if( NOT NEPOMUK_WEBMINER_FIND_QUIETLY )
+ message( STATUS "Found Nepomuk WebMiner libraries : \
${NEPOMUK_WEBMINER_LIBS}" ) + endif( NOT NEPOMUK_WEBMINER_FIND_QUIETLY )
+else( NEPOMUK_WEBMINER_FOUND )
+ if( LibNepomukMetadataExtractor_FIND_REQUIRED )
+ message( FATAL_ERROR "Could not find Nepomuk WebMiner libraries" )
+ endif( LibNepomukMetadataExtractor_FIND_REQUIRED )
+endif( NEPOMUK_WEBMINER_FOUND )
+
+
+mark_as_advanced(
+ NEPOMUK_WEBMINER_INCLUDE_DIRS
+ NEPOMUK_INCLUDE_DIRS
+)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 242bc15..8ef1ee5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,12 +42,11 @@ target_link_libraries(conquirere
${NEPOMUK_LIBRARIES}
${NEPOMUK_QUERY_LIBRARIES}
nepomukcore
- nepomuksync
#include kbibtex
${KBIBTEX_LIBRARIES}
- ${NEPOMUK_METADATA_EXTRACTOR_LIBS}
+ ${NEPOMUK_WEBMINER_LIBS}
)
install(TARGETS conquirere DESTINATION ${BIN_INSTALL_DIR})
diff --git a/src/mainui/docklets/searchwidget.cpp \
b/src/mainui/docklets/searchwidget.cpp index dc04466..dd902ad 100644
--- a/src/mainui/docklets/searchwidget.cpp
+++ b/src/mainui/docklets/searchwidget.cpp
@@ -18,7 +18,7 @@
#include "searchwidget.h"
#include "ui_searchwidget.h"
-#include <nepomukmetadataextractor/extractorfactory.h>
+#include <nepomuk-webminer/extractorfactory.h>
#include <Nepomuk2/ResourceManager>
#include <Soprano/Model>
@@ -392,10 +392,10 @@ void SearchWidget::setupUi()
KConfig config;
KConfigGroup searchSettingsGroup( &config, QLatin1String("SearchSettings") );
- m_ef = new NepomukMetaDataExtractor::Extractor::ExtractorFactory;
- QList<NepomukMetaDataExtractor::Extractor::WebExtractor::Info> plugins = \
m_ef->listAvailablePlugins(QLatin1String("publication")); + m_ef = new \
NepomukWebMiner::Extractor::ExtractorFactory; + \
QList<NepomukWebMiner::Extractor::WebExtractor::Info> plugins = \
m_ef->listAvailablePlugins(QLatin1String("publication"));
- foreach(const NepomukMetaDataExtractor::Extractor::WebExtractor::Info & info, \
plugins) { + foreach(const NepomukWebMiner::Extractor::WebExtractor::Info & info, \
plugins) {
QListWidgetItem *item = new QListWidgetItem(info.name, ui->listWebEngines);
item->setCheckState(searchSettingsGroup.readEntry(info.identifier, false) ? \
Qt::Checked : Qt::Unchecked);
diff --git a/src/mainui/docklets/searchwidget.h b/src/mainui/docklets/searchwidget.h
index 22e2da9..79af2aa 100644
--- a/src/mainui/docklets/searchwidget.h
+++ b/src/mainui/docklets/searchwidget.h
@@ -29,7 +29,7 @@ namespace Ui {
class SearchWidget;
}
-namespace NepomukMetaDataExtractor {
+namespace NepomukWebMiner {
namespace Extractor {
class ExtractorFactory;
class WebExtractor;
@@ -88,8 +88,8 @@ private:
KAction *m_actionOpenHomepage;
SearchResultModel *m_searchResultModel;
- NepomukMetaDataExtractor::Extractor::ExtractorFactory *m_ef;
- NepomukMetaDataExtractor::Extractor::WebExtractor *m_currentWebExtractor;
+ NepomukWebMiner::Extractor::ExtractorFactory *m_ef;
+ NepomukWebMiner::Extractor::WebExtractor *m_currentWebExtractor;
QStringList m_pluginList;
int m_currentExtractor;
int m_maxProgress;
diff --git a/src/mainui/sidebar/searchresultinfowidget.cpp \
b/src/mainui/sidebar/searchresultinfowidget.cpp index 126c0d5..67b783a 100644
--- a/src/mainui/sidebar/searchresultinfowidget.cpp
+++ b/src/mainui/sidebar/searchresultinfowidget.cpp
@@ -20,11 +20,11 @@
#include <KDE/KDebug>
-#include <nepomukmetadataextractor/krossextractor.h>
-#include <nepomukmetadataextractor/publicationpipe.h>
+#include <nepomuk-webminer/krossextractor.h>
+#include <nepomuk-webminer/publicationpipe.h>
-using namespace NepomukMetaDataExtractor::Extractor;
-using namespace NepomukMetaDataExtractor::Pipe;
+using namespace NepomukWebMiner::Extractor;
+using namespace NepomukWebMiner::Pipe;
SearchResultInfoWidget::SearchResultInfoWidget(QWidget *parent) :
SidebarComponent(parent),
diff --git a/src/mainui/sidebar/searchresultinfowidget.h \
b/src/mainui/sidebar/searchresultinfowidget.h index 492876e..55ea11f 100644
--- a/src/mainui/sidebar/searchresultinfowidget.h
+++ b/src/mainui/sidebar/searchresultinfowidget.h
@@ -21,7 +21,7 @@
#include "sidebarcomponent.h"
#include "core/models/searchresultmodel.h"
-#include <nepomukmetadataextractor/batchextractor.h>
+#include <nepomuk-webminer/batchextractor.h>
#include <Nepomuk2/Resource>
@@ -51,7 +51,7 @@ private slots:
private:
Ui::SearchResultInfoWidget *ui;
SearchResultModel::SRCachedRowEntry m_currentEntry;
- NepomukMetaDataExtractor::UI::BatchExtractor m_extractor;
+ NepomukWebMiner::UI::BatchExtractor m_extractor;
};
#endif // SEARCHRESULTINFOWIDGET_H
diff --git a/src/mainui/sidebar/sidebarwidget.cpp \
b/src/mainui/sidebar/sidebarwidget.cpp index ad5d211..439eaac 100644
--- a/src/mainui/sidebar/sidebarwidget.cpp
+++ b/src/mainui/sidebar/sidebarwidget.cpp
@@ -40,7 +40,7 @@
#include "nbibio/bibtex/bibtexvariant.h"
#include <kbibtex/findpdfui.h>
-#include <nepomukmetadataextractor/fetcherdialog.h>
+#include <nepomuk-webminer/fetcherdialog.h>
#include <Nepomuk2/Resource>
#include <Nepomuk2/Variant>
@@ -60,7 +60,7 @@
using namespace Soprano::Vocabulary;
using namespace Nepomuk2::Vocabulary;
-using namespace NepomukMetaDataExtractor::UI;
+using namespace NepomukWebMiner::UI;
SidebarWidget::SidebarWidget(QWidget *parent)
: QWidget(parent)
diff --git a/src/nbibio/CMakeLists.txt b/src/nbibio/CMakeLists.txt
index c99a969..b0d0a7f 100644
--- a/src/nbibio/CMakeLists.txt
+++ b/src/nbibio/CMakeLists.txt
@@ -46,7 +46,7 @@ target_link_libraries(nbibio
zoterosync
# additional libs
- ${NEPOMUK_METADATA_EXTRACTOR_LIBS}
+ ${NEPOMUK_WEBMINER_LIBS}
)
install( TARGETS nbibio ${INSTALL_TARGETS_DEFAULT_ARGS} )
diff --git a/src/nbibio/bibtex/bibtexvariant.cpp \
b/src/nbibio/bibtex/bibtexvariant.cpp index 75e16a8..33636a5 100644
--- a/src/nbibio/bibtex/bibtexvariant.cpp
+++ b/src/nbibio/bibtex/bibtexvariant.cpp
@@ -24,12 +24,12 @@
#include <kbibtex/entry.h>
#include <kbibtex/macro.h>
-#include <nepomukmetadataextractor/nepomukpipe.h>
+#include <nepomuk-webminer/nepomukpipe.h>
#include <KDE/KDebug>
#include <QtCore/QMapIterator>
-using namespace NepomukMetaDataExtractor::Pipe;
+using namespace NepomukWebMiner::Pipe;
QVariantList BibTexVariant::toVariant(const File &bibtexFile)
{
diff --git a/src/nbibio/pipe/varianttonepomukpipe.cpp \
b/src/nbibio/pipe/varianttonepomukpipe.cpp index 9c25865..2f81a4c 100644
--- a/src/nbibio/pipe/varianttonepomukpipe.cpp
+++ b/src/nbibio/pipe/varianttonepomukpipe.cpp
@@ -18,7 +18,7 @@
#include "varianttonepomukpipe.h"
#include "nbibio/provider/onlinestorage.h"
-#include <nepomukmetadataextractor/publicationpipe.h>
+#include <nepomuk-webminer/publicationpipe.h>
#include <KDE/KJob>
@@ -93,7 +93,7 @@ void VariantToNepomukPipe::pipeExport(QVariantList \
&publicationList)
importedPublication.second = \
publicationEntry.value(QLatin1String("nepomuk-reference-uri")).toUrl(); }
else {
- NepomukMetaDataExtractor::Pipe::PublicationPipe publicationPipe;
+ NepomukWebMiner::Pipe::PublicationPipe publicationPipe;
// either conquirere or one of the unittests (overrides \
"metadata-extractor" component)
publicationPipe.overrideComponentName( \
KGlobal::mainComponent().componentName() ); @@ -240,7 +240,7 @@ void \
VariantToNepomukPipe::importAttachment(const QVariantMap &attachmentEntry) }
QString accessdate = attachmentEntry.value("accessdate").toString();
- QDateTime dateTime = \
NepomukMetaDataExtractor::Pipe::NepomukPipe::createDateTime( accessdate ); + \
QDateTime dateTime = NepomukWebMiner::Pipe::NepomukPipe::createDateTime( accessdate \
);
if(dateTime.isValid()) {
QString date = dateTime.toString(Qt::ISODate);
diff --git a/tests/Test-zotero.data/CMakeLists.txt \
b/tests/Test-zotero.data/CMakeLists.txt index 52bb2e5..c995133 100644
--- a/tests/Test-zotero.data/CMakeLists.txt
+++ b/tests/Test-zotero.data/CMakeLists.txt
@@ -28,7 +28,6 @@ target_link_libraries(Test-zotero.data
${NEPOMUK_LIBRARIES}
${NEPOMUK_QUERY_LIBRARIES}
nepomukcore
- nepomuksync
#include kbibtex
${KBIBTEX_LIBRARIES}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic