GNOME.org
 

[tracker] tracker-extract: Removed support for libstreamanalyzer

commit 8092dd15705e67a52438085754e609ea7ef0cc73
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Mar 18 16:15:30 2014 +0000

    tracker-extract: Removed support for libstreamanalyzer
    
    This has not been compiled or used in years and likely doesn't produce an
    ontology compatible output that we could use.
    
    EXTERMINATE!

 configure.ac                                |   36 ---
 docs/manpages/tracker-extract.1             |    4 -
 src/tracker-extract/Makefile.am             |    4 -
 src/tracker-extract/tracker-extract.c       |   51 +---
 src/tracker-extract/tracker-extract.h       |    1 -
 src/tracker-extract/tracker-main.c          |   29 +--
 src/tracker-extract/tracker-topanalyzer.cpp |  454 ---------------------------
 src/tracker-extract/tracker-topanalyzer.h   |   37 ---
 8 files changed, 3 insertions(+), 613 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6a5fafc..b729e91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,8 +189,6 @@ EVO_REQUIRED=2.32.0
 EVO_SHELL_REQUIRED=2.32.0
 EDS_REQUIRED=2.32.0
 CAMEL_REQUIRED=2.32.0
-# Unlikely version for now, Nepomuk integration isn't finished in streamanalyzer atm
-LIBSTREAMANALYZER_REQUIRED=0.7.0
 GEE_REQUIRED=0.3
 TAGLIB_REQUIRED=1.6
 LIBGRSS_REQUIRED=0.5
@@ -1500,39 +1498,6 @@ fi
 
 AM_CONDITIONAL(HAVE_ENCA, test "$have_enca" = "yes")
 
-####################################################################
-# Check for tracker-extract: libstreamanalyzer
-####################################################################
-
-AC_ARG_ENABLE(libstreamanalyzer,
-              AS_HELP_STRING([--enable-libstreamanalyzer],
-                             [enable libstreamananalyzer [[default=no]]]),,
-              [enable_libstreamanalyzer=no])
-
-if test "x$enable_libstreamanalyzer" != "xno"; then
-   PKG_CHECK_MODULES(LIBSTREAMANALYZER,
-                     [libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED],
-                     [have_libstreamanalyzer=yes],
-                     [have_libstreamanalyzer=no])
-
-   TRACKER_EXTRACT_CFLAGS="$TRACKER_EXTRACT_CFLAGS $LIBSTREAMANALYZER_CFLAGS"
-   TRACKER_EXTRACT_LIBS="$TRACKER_EXTRACT_LIBS $LIBSTREAMANALYZER_LIBS"
-
-   if test "x$have_libstreamanalyzer" = "xyes"; then
-      AC_DEFINE(HAVE_LIBSTREAMANALYZER, [], [Define if we have libstreamanalyzer])
-   fi
-else
-   have_libstreamanalyzer="no  (disabled)"
-fi
-
-if test "x$enable_libstreamanalyzer" = "xyes"; then
-   if test "x$have_libstreamanalyzer" != "xyes"; then
-      AC_MSG_ERROR([Couldn't find libstreamanalyzer >= $LIBSTREAMANALYZER_REQUIRED and libstreamanalyzer.])
-   fi
-fi
-
-AM_CONDITIONAL(HAVE_LIBSTREAMANALYZER, test "$have_libstreamanalyzer" = "yes")
-
 ##################################################################
 # Check for tracker-extract: libxml2 for XML/HTML extractor
 ##################################################################
@@ -2572,7 +2537,6 @@ Applications:
 
 Metadata Extractors:
 
-       Support libstreamanalyzer:              $have_libstreamanalyzer
        Support PNG:                            $have_libpng
        Support PDF:                            $have_poppler
        Support XPS:                            $have_libgxps
diff --git a/docs/manpages/tracker-extract.1 b/docs/manpages/tracker-extract.1
index 3d7fd12..b17d6d6 100644
--- a/docs/manpages/tracker-extract.1
+++ b/docs/manpages/tracker-extract.1
@@ -33,10 +33,6 @@ be either a local path or a URI. It also does not have to be an absolute path.
 The \fIMIME\fR type to use for the file. If one is not provided, it
 will be guessed automatically.
 .TP
-.B \-i, \-\-force-internal-extractors
-Use this option to force internal extractors over 3rd parties like
-libstreamanalyzer.
-.TP
 .B \-m, \-\-force-module=MODULE
 Force a particular module to be used. This is here as a convenience
 for developers wanting to test their \fIMODULE\fR file. Only the
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 69a638e..a86db7c 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -559,10 +559,6 @@ tracker_extract_CFLAGS = $(LIBGSF_CFLAGS)
 tracker_extract_LDADD += $(LIBGSF_LIBS)
 endif
 
-if HAVE_LIBSTREAMANALYZER
-tracker_extract_SOURCES += tracker-topanalyzer.cpp tracker-topanalyzer.h
-endif
-
 # do nothing, output as a side-effect
 tracker-extract-priority-dbus.c: tracker-extract-priority-dbus-stamp
        @:
diff --git a/src/tracker-extract/tracker-extract.c b/src/tracker-extract/tracker-extract.c
index 624cdf1..5b3eca9 100644
--- a/src/tracker-extract/tracker-extract.c
+++ b/src/tracker-extract/tracker-extract.c
@@ -37,10 +37,6 @@
 #include "tracker-extract.h"
 #include "tracker-main.h"
 
-#ifdef HAVE_LIBSTREAMANALYZER
-#include "tracker-topanalyzer.h"
-#endif /* HAVE_STREAMANALYZER */
-
 #ifdef THREAD_ENABLE_TRACE
 #warning Main thread traces enabled
 #endif /* THREAD_ENABLE_TRACE */
@@ -72,7 +68,6 @@ typedef struct {
        GHashTable *single_thread_extractors;
 
        gboolean disable_shutdown;
-       gboolean force_internal_extractors;
        gboolean disable_summary_on_finalize;
 
        gchar *force_module;
@@ -129,10 +124,6 @@ tracker_extract_init (TrackerExtract *object)
 {
        TrackerExtractPrivate *priv;
 
-#ifdef HAVE_LIBSTREAMANALYZER
-       tracker_topanalyzer_init ();
-#endif /* HAVE_STREAMANALYZER */
-
        priv = TRACKER_EXTRACT_GET_PRIVATE (object);
        priv->statistics_data = g_hash_table_new_full (NULL, NULL, NULL,
                                                       (GDestroyNotify) statistics_data_free);
@@ -159,10 +150,6 @@ tracker_extract_finalize (GObject *object)
                report_statistics (object);
        }
 
-#ifdef HAVE_LIBSTREAMANALYZER
-       tracker_topanalyzer_shutdown ();
-#endif /* HAVE_STREAMANALYZER */
-
        g_hash_table_destroy (priv->statistics_data);
 
        g_mutex_clear (&priv->task_mutex);
@@ -217,7 +204,6 @@ report_statistics (GObject *object)
 
 TrackerExtract *
 tracker_extract_new (gboolean     disable_shutdown,
-                     gboolean     force_internal_extractors,
                      const gchar *force_module)
 {
        TrackerExtract *object;
@@ -233,7 +219,6 @@ tracker_extract_new (gboolean     disable_shutdown,
        priv = TRACKER_EXTRACT_GET_PRIVATE (object);
 
        priv->disable_shutdown = disable_shutdown;
-       priv->force_internal_extractors = force_internal_extractors;
        priv->force_module = g_strdup (force_module);
 
        return object;
@@ -287,9 +272,6 @@ get_file_metadata (TrackerExtractTask  *task,
        TrackerExtractInfo *info;
        GFile *file;
        gchar *mime_used = NULL;
-#ifdef HAVE_LIBSTREAMANALYZER
-       gchar *content_type = NULL;
-#endif
        gint items = 0;
 
        *info_out = NULL;
@@ -298,41 +280,10 @@ get_file_metadata (TrackerExtractTask  *task,
        info = tracker_extract_info_new (file, task->mimetype, task->graph);
        g_object_unref (file);
 
-#ifdef HAVE_LIBSTREAMANALYZER
-       /* FIXME: This entire section is completely broken,
-        * it doesn't even build these days. It should be removed or fixed.
-        * -mr (05/09/11)
-        */
-       if (!priv->force_internal_extractors) {
-               g_debug ("Using libstreamanalyzer...");
-
-               tracker_topanalyzer_extract (task->file, statements, &content_type);
-
-               if (tracker_sparql_builder_get_length (statements) > 0) {
-                       g_free (content_type);
-                       tracker_sparql_builder_insert_close (statements);
-
-                       *info_out = info;
-
-                       return TRUE;
-               }
-       } else {
-               g_debug ("Using internal extractors ONLY...");
-       }
-#endif /* HAVE_LIBSTREAMANALYZER */
-
        if (task->mimetype && *task->mimetype) {
                /* We know the mime */
                mime_used = g_strdup (task->mimetype);
-       }
-#ifdef HAVE_LIBSTREAMANALYZER
-       else if (content_type && *content_type) {
-               /* We know the mime from LSA */
-               mime_used = content_type;
-               g_strstrip (mime_used);
-       }
-#endif /* HAVE_LIBSTREAMANALYZER */
-       else {
+       } else {
                tracker_extract_info_unref (info);
                return FALSE;
        }
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 4bb39a9..1d250d9 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -50,7 +50,6 @@ struct TrackerExtractClass {
 
 GType           tracker_extract_get_type                (void);
 TrackerExtract *tracker_extract_new                     (gboolean                disable_shutdown,
-                                                         gboolean                force_internal_extractors,
                                                          const gchar            *force_module);
 
 void            tracker_extract_file                    (TrackerExtract         *extract,
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 23bfd25..c707922 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -71,14 +71,11 @@
        "\n" \
        "  http://www.gnu.org/licenses/gpl.txt\n";
 
-#define QUIT_TIMEOUT 30 /* 1/2 minutes worth of seconds */
-
 static GMainLoop *main_loop;
 
 static gint verbosity = -1;
 static gchar *filename;
 static gchar *mime_type;
-static gboolean force_internal_extractors;
 static gchar *force_module;
 static gboolean version;
 
@@ -98,10 +95,6 @@ static GOptionEntry entries[] = {
          G_OPTION_ARG_STRING, &mime_type,
          N_("MIME type for file (if not provided, this will be guessed)"),
          N_("MIME") },
-       { "force-internal-extractors", 'i', 0,
-         G_OPTION_ARG_NONE, &force_internal_extractors,
-         N_("Force internal extractors over 3rd parties like libstreamanalyzer"),
-         NULL },
        { "force-module", 'm', 0,
          G_OPTION_ARG_STRING, &force_module,
          N_("Force a module to be used for extraction (e.g. \"foo\" for \"foo.so\")"),
@@ -288,9 +281,7 @@ run_standalone (TrackerConfig *config)
        file = g_file_new_for_commandline_arg (filename);
        uri = g_file_get_uri (file);
 
-       object = tracker_extract_new (TRUE,
-                                     force_internal_extractors,
-                                     force_module);
+       object = tracker_extract_new (TRUE, force_module);
 
        if (!object) {
                g_object_unref (file);
@@ -354,20 +345,6 @@ main (int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
-       if (force_internal_extractors && force_module) {
-               gchar *help;
-
-               g_printerr ("%s\n\n",
-                           _("Options --force-internal-extractors and --force-module can't be used 
together"));
-
-               help = g_option_context_get_help (context, TRUE, NULL);
-               g_option_context_free (context);
-               g_printerr ("%s", help);
-               g_free (help);
-
-               return EXIT_FAILURE;
-       }
-
        g_option_context_free (context);
 
        if (version) {
@@ -409,9 +386,7 @@ main (int argc, char *argv[])
                                            tracker_db_manager_get_first_index_done () == FALSE);
        tracker_memory_setrlimits ();
 
-       extract = tracker_extract_new (TRUE,
-                                      force_internal_extractors,
-                                      force_module);
+       extract = tracker_extract_new (TRUE, force_module);
 
        if (!extract) {
                g_object_unref (config);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]