[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/nepomuk-kde
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2011-02-25 14:55:49
Message-ID: 20110225145549.7A3B4AC8C0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1222718 by trueg:

Moved TextExtractionJob, Strigi, and Olena integration into nepomukextras
since we will use them in both Scribo and nepomukannotation.


 M  +0 -22     annotation/lib/CMakeLists.txt  
 D             annotation/lib/nepomukannotation_config.h.cmake  
 D             annotation/lib/strigitextextractionjob.cpp  
 D             annotation/lib/strigitextextractionjob.h  
 D             annotation/lib/textextractionjob.cpp  
 D             annotation/lib/textextractionjob.h  
 M  +4 -0      annotation/plugins/dbpedia/dbpediaannotationplugin.cpp  
 M  +21 -8     nepomukutils/CMakeLists.txt  
 A             nepomukutils/nepomukextras_config.h.cmake   \
annotation/lib/nepomukannotation_config.h.cmake#1221102  A             \
nepomukutils/strigitextextractionjob.cpp   \
annotation/lib/strigitextextractionjob.cpp#1221104 [License: LGPL (v2)]  A            \
nepomukutils/strigitextextractionjob.h   \
annotation/lib/strigitextextractionjob.h#1221104 [License: LGPL (v2)]  A             \
nepomukutils/textextractionjob.cpp   annotation/lib/textextractionjob.cpp#1221102 \
[License: LGPL]  A             nepomukutils/textextractionjob.h   \
annotation/lib/textextractionjob.h#1221102 [License: LGPL]


--- trunk/playground/base/nepomuk-kde/annotation/lib/CMakeLists.txt #1222717:1222718
@@ -2,32 +2,19 @@
 
 include(SopranoAddOntology)
 
-set(STRIGI_MIN_VERSION 0.6.95)
-find_package(Strigi REQUIRED)
-
-macro_log_feature(Strigi_FOUND "Strigi" "Strigi file analyzer libs (streamanalyzer)" \
                "kdesupport" TRUE "" "Required to build annotation framework.")
-
 include_directories(
   ${QT_INCLUDES}
   ${KDE4_INCLUDES}
   ${SOPRANO_INCLUDE_DIR}
   ${NEPOMUK_INCLUDE_DIR}
-  ${STRIGI_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/gui
   ${CMAKE_CURRENT_BINARY_DIR}
   ${nepomukextras_SOURCE_DIR}
   ${nepomuk_kde_SOURCE_DIR}/misc
   ${CMAKE_CURRENT_SOURCE_DIR}/../../usercontext/lib
-  ${kolena_SOURCE_DIR}
 )
 
-if(TESSERACT_FOUND AND TIFF_FOUND)
-  set(HAVE_OLENA 1)
-endif()
-
-configure_file(nepomukannotation_config.h.cmake \
                ${CMAKE_CURRENT_BINARY_DIR}/nepomukannotation_config.h)
-
 set( corelib_SRCS
     annotationpluginfactory.cpp
     annotationplugin.cpp
@@ -41,8 +28,6 @@
     textannotation.cpp
     stackedtextannotation.cpp
     stackedpimotextannotation.cpp
-    textextractionjob.cpp
-    strigitextextractionjob.cpp
     gui/annotationrelevancefiltermodel.cpp
     gui/resourceannotationmodel.cpp
     gui/annotationmodel.cpp
@@ -80,16 +65,10 @@
   ${QT_QTGUI_LIBRARY}
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
-  ${STRIGI_STREAMANALYZER_LIBRARY}
-  ${STRIGI_STREAMS_LIBRARY}
   nepomukextras
   nepomukcontext
 )
 
-if(HAVE_OLENA)
-  target_link_libraries(nepomukannotation kolena)
-endif()
-
 set_target_properties(nepomukannotation PROPERTIES VERSION 0.1.0 SOVERSION 0)
 
 install(TARGETS nepomukannotation DESTINATION ${LIB_INSTALL_DIR})
@@ -106,7 +85,6 @@
   stackedtextannotation.h
   stackedpimotextannotation.h
   textannotation.h
-  textextractionjob.h
   gui/annotationrelevancefiltermodel.h
   gui/annotationmodel.h
   gui/resourceannotationmodel.h
--- trunk/playground/base/nepomuk-kde/annotation/plugins/dbpedia/dbpediaannotationplugin.cpp \
#1222717:1222718 @@ -104,6 +104,10 @@
     while ( it.next() ) {
         kDebug() << it.current();
     }
+
+    // TODO: create annotations either as new pimo things that are related to the \
resource or as +    //       being the resource (ie. an occurrence of \
resource().pimoThing()) +
     emitFinished();
 }
 
--- trunk/playground/base/nepomuk-kde/nepomukutils/CMakeLists.txt #1222717:1222718
@@ -2,12 +2,24 @@
 
 include(SopranoAddOntology)
 
+set(STRIGI_MIN_VERSION 0.6.95)
+find_package(Strigi)
+macro_log_feature(Strigi_FOUND "libstreamanalyzer" "Strigi file analyzer libs \
(streamanalyzer)" "libstreamanalyzer" TRUE "" "Required to extract text from files.") \
+ +if(TESSERACT_FOUND AND TIFF_FOUND)
+  set(HAVE_OLENA 1)
+endif()
+
+configure_file(nepomukextras_config.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/nepomukextras_config.h) +
 include_directories(
   ${QT_INCLUDES}
   ${KDE4_INCLUDES}
   ${NEPOMUK_INCLUDE_DIR}
   ${NEPOMUK_INCLUDE_DIR}/nepomuk
   ${CMAKE_SOURCE_DIR}
+  ${STRIGI_INCLUDE_DIR}
+  ${kolena_SOURCE_DIR}
 )
 
 set(nepomukextras_SRC
@@ -28,15 +40,12 @@
   resourceactions.cpp
   statementeditor.cpp
   classmodel.cpp
+  textextractionjob.cpp
+  strigitextextractionjob.cpp
 )
 
 kde4_add_ui_files(nepomukextras_SRC daterangeselectionwidget.ui \
newresourcedialog.ui)  
-
-soprano_add_ontology(nepomukextras_SRC \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/pimo/pimo.trig "PIMO" "Nepomuk::Vocabulary" \
                "trig" VISIBILITY "nepomukextras")
-soprano_add_ontology(nepomukextras_SRC \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Nepomuk::Vocabulary" "trig" \
                VISIBILITY "nepomukextras")
-soprano_add_ontology(nepomukextras_SRC \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Nepomuk::Vocabulary" "trig" \
                VISIBILITY "nepomukextras")
-
 kde4_add_library(nepomukextras SHARED ${nepomukextras_SRC})
 
 target_link_libraries(
@@ -47,9 +56,15 @@
   ${SOPRANO_LIBRARIES}
   ${NEPOMUK_LIBRARIES}
   ${NEPOMUK_QUERY_LIBRARIES}
+  ${STRIGI_STREAMANALYZER_LIBRARY}
+  ${STRIGI_STREAMS_LIBRARY}
   nepomukutils
 )
 
+if(HAVE_OLENA)
+  target_link_libraries(nepomukextras kolena)
+endif()
+
 set_target_properties(nepomukextras PROPERTIES VERSION 0.1.0 SOVERSION 0)
 
 install(TARGETS nepomukextras DESTINATION ${LIB_INSTALL_DIR})
@@ -71,9 +86,7 @@
   newresourcedialog.h
   statementeditor.h
   classmodel.h
-  ${CMAKE_CURRENT_BINARY_DIR}/nie.h
-  ${CMAKE_CURRENT_BINARY_DIR}/nfo.h
-  ${CMAKE_CURRENT_BINARY_DIR}/pimo.h
+  textextractionjob.h
   DESTINATION ${INCLUDE_INSTALL_DIR}/nepomuk)
 
 add_subdirectory(test)


[prev in list] [next in list] [prev in thread] [next in thread]