[tracker] tracker-store: Removed org.freedesktop.Tracker.Search DBus interface
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker] tracker-store: Removed org.freedesktop.Tracker.Search DBus interface
- Date: Mon, 6 Jul 2009 17:34:01 +0000 (UTC)
commit 3b04a785fbd72ba24bcca91d23acc9af67e727d3
Author: Martyn Russell <martyn imendio com>
Date: Mon Jul 6 18:22:11 2009 +0100
tracker-store: Removed org.freedesktop.Tracker.Search DBus interface
Also cleaned up tracker-search --help
data/dbus/Makefile.am | 1 -
data/dbus/tracker-search.xml | 27 --
src/libtracker/Makefile.am | 1 -
src/libtracker/tracker.c | 118 --------
src/libtracker/tracker.h | 22 --
.../tracker-module-metadata-utils.c | 3 +-
src/tracker-store/Makefile.am | 3 -
src/tracker-store/tracker-dbus.c | 16 -
src/tracker-store/tracker-search.c | 287 --------------------
src/tracker-store/tracker-search.h | 69 -----
src/tracker-utils/tracker-search.c | 22 --
11 files changed, 2 insertions(+), 567 deletions(-)
---
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 5712c65..a282853 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -8,7 +8,6 @@ config_DATA = \
tracker-miner.xml \
tracker-resources.xml \
tracker-resources-class.xml \
- tracker-search.xml \
tracker-statistics.xml
# Services
diff --git a/src/libtracker/Makefile.am b/src/libtracker/Makefile.am
index e6645b2..990c67f 100644
--- a/src/libtracker/Makefile.am
+++ b/src/libtracker/Makefile.am
@@ -30,7 +30,6 @@ libtrackerclientinc_HEADERS = \
# Generate DBus files from XML data.
dbus_sources = \
tracker-resources-glue.h \
- tracker-search-glue.h \
tracker-statistics-glue.h
%-glue.h: $(top_srcdir)/data/dbus/%.xml
diff --git a/src/libtracker/tracker.c b/src/libtracker/tracker.c
index bd7d06c..e6ee166 100644
--- a/src/libtracker/tracker.c
+++ b/src/libtracker/tracker.c
@@ -24,13 +24,11 @@
#include "tracker.h"
#include "tracker-resources-glue.h"
-#include "tracker-search-glue.h"
#include "tracker-statistics-glue.h"
#define TRACKER_SERVICE "org.freedesktop.Tracker"
#define TRACKER_OBJECT "/org/freedesktop/Tracker"
#define TRACKER_INTERFACE_RESOURCES "org.freedesktop.Tracker.Resources"
-#define TRACKER_INTERFACE_SEARCH "org.freedesktop.Tracker.Search"
#define TRACKER_INTERFACE_STATISTICS "org.freedesktop.Tracker.Statistics"
typedef struct {
@@ -39,11 +37,6 @@ typedef struct {
} CallbackGPtrArray;
typedef struct {
- TrackerReplyString callback;
- gpointer data;
-} CallbackString;
-
-typedef struct {
TrackerReplyVoid callback;
gpointer data;
} CallbackVoid;
@@ -67,24 +60,6 @@ tracker_GPtrArray_reply (DBusGProxy *proxy,
}
static void
-tracker_string_reply (DBusGProxy *proxy,
- gchar *OUT_result,
- GError *error,
- gpointer user_data)
-{
-
- CallbackString *s;
-
- s = user_data;
-
- (*(TrackerReplyString) s->callback) (OUT_result,
- error,
- s->data);
-
- g_free (s);
-}
-
-static void
tracker_void_reply (DBusGProxy *proxy,
GError *error,
gpointer user_data)
@@ -182,12 +157,6 @@ tracker_connect (gboolean enable_warnings)
client = g_new0 (TrackerClient, 1);
- client->proxy_search =
- dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
- TRACKER_OBJECT "/Search",
- TRACKER_INTERFACE_SEARCH);
-
client->proxy_statistics =
dbus_g_proxy_new_for_name (connection,
TRACKER_SERVICE,
@@ -206,10 +175,6 @@ tracker_connect (gboolean enable_warnings)
void
tracker_disconnect (TrackerClient *client)
{
- if (client->proxy_search) {
- g_object_unref (client->proxy_search);
- }
-
if (client->proxy_statistics) {
g_object_unref (client->proxy_statistics);
}
@@ -300,45 +265,6 @@ tracker_resources_batch_commit (TrackerClient *client,
&*error);
}
-
-gchar *
-tracker_search_get_snippet (TrackerClient *client,
- const gchar *uri,
- const gchar *search_text,
- GError **error)
-{
- gchar *result;
-
- if (!org_freedesktop_Tracker_Search_get_snippet (client->proxy_search,
- uri,
- search_text,
- &result,
- &*error)) {
- return NULL;
- }
-
- return result;
-}
-
-gchar *
-tracker_search_suggest (TrackerClient *client,
- const gchar *search_term,
- gint maxdist,
- GError **error)
-{
- gchar *result;
-
- if (org_freedesktop_Tracker_Search_suggest (client->proxy_search,
- search_term,
- maxdist,
- &result,
- &*error)) {
- return result;
- }
-
- return NULL;
-}
-
void
tracker_statistics_get_async (TrackerClient *client,
TrackerReplyGPtrArray callback,
@@ -454,47 +380,3 @@ tracker_resources_batch_commit_async (TrackerClient *client,
tracker_void_reply,
s);
}
-
-void
-tracker_search_get_snippet_async (TrackerClient *client,
- const gchar *uri,
- const gchar *search_text,
- TrackerReplyString callback,
- gpointer user_data)
-{
- CallbackString *s;
-
- s = g_new0 (CallbackString, 1);
- s->callback = callback;
- s->data = user_data;
-
- client->pending_proxy = client->proxy_search;
- client->pending_call =
- org_freedesktop_Tracker_Search_get_snippet_async (client->proxy_search,
- uri,
- search_text,
- tracker_string_reply,
- s);
-}
-
-void
-tracker_search_suggest_async (TrackerClient *client,
- const gchar *search_text,
- gint maxdist,
- TrackerReplyString callback,
- gpointer user_data)
-{
- CallbackString *s;
-
- s = g_new0 (CallbackString, 1);
- s->callback = callback;
- s->data = user_data;
-
- client->pending_proxy = client->proxy_search;
- client->pending_call =
- org_freedesktop_Tracker_Search_suggest_async (client->proxy_search,
- search_text,
- maxdist,
- tracker_string_reply,
- s);
-}
diff --git a/src/libtracker/tracker.h b/src/libtracker/tracker.h
index 2092ee3..661aa69 100644
--- a/src/libtracker/tracker.h
+++ b/src/libtracker/tracker.h
@@ -25,7 +25,6 @@
G_BEGIN_DECLS
typedef struct {
- DBusGProxy *proxy_search;
DBusGProxy *proxy_statistics;
DBusGProxy *proxy_resources;
@@ -36,9 +35,6 @@ typedef struct {
typedef void (*TrackerReplyGPtrArray) (GPtrArray *result,
GError *error,
gpointer user_data);
-typedef void (*TrackerReplyString) (gchar *result,
- GError *error,
- gpointer user_data);
typedef void (*TrackerReplyVoid) (GError *error,
gpointer user_data);
@@ -66,14 +62,6 @@ void tracker_resources_batch_sparql_update (TrackerClient
GError **error);
void tracker_resources_batch_commit (TrackerClient *client,
GError **error);
-gchar * tracker_search_get_snippet (TrackerClient *client,
- const gchar *uri,
- const gchar *search_text,
- GError **error);
-gchar * tracker_search_suggest (TrackerClient *client,
- const gchar *search_text,
- gint maxdist,
- GError **error);
/* Asynchronous API */
void tracker_statistics_get_async (TrackerClient *client,
TrackerReplyGPtrArray callback,
@@ -97,16 +85,6 @@ void tracker_resources_batch_sparql_update_async (TrackerClient
void tracker_resources_batch_commit_async (TrackerClient *client,
TrackerReplyVoid callback,
gpointer user_data);
-void tracker_search_get_snippet_async (TrackerClient *client,
- const gchar *uri,
- const gchar *search_text,
- TrackerReplyString callback,
- gpointer user_data);
-void tracker_search_suggest_async (TrackerClient *client,
- const gchar *search_text,
- gint maxdist,
- TrackerReplyString callback,
- gpointer user_data);
G_END_DECLS
diff --git a/src/tracker-miner-fs/tracker-module-metadata-utils.c b/src/tracker-miner-fs/tracker-module-metadata-utils.c
index ddf3c36..3fe867a 100644
--- a/src/tracker-miner-fs/tracker-module-metadata-utils.c
+++ b/src/tracker-miner-fs/tracker-module-metadata-utils.c
@@ -810,7 +810,8 @@ tracker_module_metadata_utils_get_data (GFile *file, TrackerSparqlBuilder *sparq
tracker_sparql_builder_object_date (sparql, &time_);
time_ = g_file_info_get_attribute_uint64 (file_info, G_FILE_ATTRIBUTE_TIME_ACCESS);
tracker_sparql_builder_predicate (sparql, "nfo:fileLastAccessed");
- tracker_sparql_builder_object_date (sparql, &time_);
+
+tracker_sparql_builder_object_date (sparql, &time_);
/* Check the size is actually non-zero */
if (g_file_info_get_size (file_info) > 0) {
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 6b65012..a8112a2 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -38,8 +38,6 @@ tracker_store_SOURCES = \
tracker-marshal-main.c \
tracker-resources.c \
tracker-resources.h \
- tracker-search.c \
- tracker-search.h \
tracker-volume-cleanup.c \
tracker-volume-cleanup.h \
tracker-push.c \
@@ -92,7 +90,6 @@ marshal_sources = \
dbus_sources = \
tracker-backup-glue.h \
tracker-resources-glue.h \
- tracker-search-glue.h \
tracker-statistics-glue.h \
tracker-resources-class-glue.h
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index 160cf5b..d1b0350 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -39,8 +39,6 @@
#include "tracker-resources-glue.h"
#include "tracker-resource-class.h"
#include "tracker-resources-class-glue.h"
-#include "tracker-search.h"
-#include "tracker-search-glue.h"
#include "tracker-statistics.h"
#include "tracker-statistics-glue.h"
#include "tracker-backup.h"
@@ -220,20 +218,6 @@ tracker_dbus_register_objects (TrackerConfig *config,
TRACKER_RESOURCES_PATH);
objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Search */
- object = tracker_search_new (config, language);
- if (!object) {
- g_critical ("Could not create TrackerSearch object to register");
- return FALSE;
- }
-
- dbus_register_object (connection,
- gproxy,
- G_OBJECT (object),
- &dbus_glib_tracker_search_object_info,
- TRACKER_SEARCH_PATH);
- objects = g_slist_prepend (objects, object);
-
/* Add org.freedesktop.Tracker.Backup */
object = tracker_backup_new ();
if (!object) {
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index 5580805..5851556 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -35,14 +35,9 @@
static gint limit = 512;
static gint offset;
static gchar **terms;
-static gchar *service;
static gboolean detailed;
static GOptionEntry entries[] = {
- { "service", 's', 0, G_OPTION_ARG_STRING, &service,
- N_("Search from a specific service"),
- NULL
- },
{ "limit", 'l', 0, G_OPTION_ARG_INT, &limit,
N_("Limit the number of results shown"),
N_("512")
@@ -112,23 +107,6 @@ main (int argc, char **argv)
"\n",
_("This means if you search for 'foo' and 'bar', "
"they must BOTH exist"),
- "\n",
- "\n",
- _("Recognized services include:"),
- "\n"
- "\n",
- " Documents\n"
- " Emails\n"
- " EmailAttachments\n"
- " Music\n"
- " Images\n"
- " Videos\n"
- " Text\n"
- " Development\n"
- " Applications\n"
- " Conversations\n"
- " Folders\n"
- " Files",
NULL);
g_option_context_set_summary (context, summary);
g_option_context_add_main_entries (context, entries, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
