[tracker] Remove D-Bus interfaces File, Keyword, and Metadata
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Subject: [tracker] Remove D-Bus interfaces File, Keyword, and Metadata
- Date: Thu, 16 Apr 2009 05:02:35 -0400 (EDT)
commit bd81c71b9a39b9d31d88e9160fbc3000aaab2a1f
Author: Jürg Billeter <j bitron ch>
Date: Wed Apr 8 11:54:37 2009 +0200
Remove D-Bus interfaces File, Keyword, and Metadata
Functionality will be replaced by SPARQL.
---
data/dbus/Makefile.am | 3 -
data/dbus/tracker-daemon.xml | 15 +-
data/dbus/tracker-files.xml | 144 ----
data/dbus/tracker-keywords.xml | 78 --
data/dbus/tracker-metadata.xml | 78 --
data/dbus/tracker-search.xml | 42 --
docs/manpages/Makefile.am | 1 -
docs/manpages/tracker-meta-folder.1 | 36 -
src/libtracker-gtk/tracker-keyword-store.c | 3 +
src/libtracker-gtk/tracker-metadata-tile.c | 4 +-
src/libtracker-gtk/tracker-tag-bar.c | 9 +
src/libtracker-gtk/tracker-utils.c | 3 +
src/libtracker/Makefile.am | 3 -
src/libtracker/tracker.c | 985 -------------------------
src/libtracker/tracker.h | 88 ---
src/tracker-search-tool/tracker-search-tool.c | 11 +-
src/tracker-utils/Makefile.am | 4 -
src/tracker-utils/tracker-files.c | 3 +
src/tracker-utils/tracker-info.c | 3 +
src/tracker-utils/tracker-meta-folder.c | 286 -------
src/tracker-utils/tracker-search.c | 3 +
src/tracker-utils/tracker-services.c | 3 +
src/tracker-utils/tracker-tag.c | 3 +
src/trackerd/Makefile.am | 9 -
src/trackerd/tracker-daemon.c | 35 -
src/trackerd/tracker-daemon.h | 4 -
src/trackerd/tracker-dbus.c | 48 --
src/trackerd/tracker-files.c | 950 ------------------------
src/trackerd/tracker-files.h | 138 ----
src/trackerd/tracker-keywords.c | 549 --------------
src/trackerd/tracker-keywords.h | 91 ---
src/trackerd/tracker-metadata.c | 535 --------------
src/trackerd/tracker-metadata.h | 93 ---
src/trackerd/tracker-search.c | 388 ----------
src/trackerd/tracker-search.h | 33 -
35 files changed, 44 insertions(+), 4637 deletions(-)
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index 1415d23..218f067 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -5,9 +5,6 @@ configdir = $(datadir)/tracker
config_DATA = \
tracker-backup.xml \
tracker-daemon.xml \
- tracker-files.xml \
- tracker-keywords.xml \
- tracker-metadata.xml \
tracker-search.xml \
tracker-indexer.xml \
tracker-extract.xml
diff --git a/data/dbus/tracker-daemon.xml b/data/dbus/tracker-daemon.xml
index 2c55ba8..a7c82da 100644
--- a/data/dbus/tracker-daemon.xml
+++ b/data/dbus/tracker-daemon.xml
@@ -84,20 +84,7 @@
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="s" name="status" direction="out" />
</method>
-
- <!-- Gets all implemented services and also returns any
- corresponding metadata type class for the service (i.e. "File",
- "Doc", "Image" etc).
- If main_services_only is set to true then only the major
- services are returned.
- Output is in dict format: (service -> description, parent).
- -->
- <method name="GetServices">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="b" name="main_services_only" direction="in" />
- <arg type="a{sv}" name="result" direction="out" />
- </method>
-
+
<!-- Get statistics for services that have been indexed. Output is
in string array format: [service, no of entities]
-->
diff --git a/data/dbus/tracker-files.xml b/data/dbus/tracker-files.xml
deleted file mode 100644
index 4cca162..0000000
--- a/data/dbus/tracker-files.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- File Specific calls -->
-<node name="/org/freedesktop/Tracker">
- <interface name="org.freedesktop.Tracker.Files">
- <!-- Determines if the file is in tracker's database. The option
- auto_create if set to TRUE will register the file in the
- database if not already present.
- -->
- <method name="Exist">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="b" name="auto_create" direction="in" />
- <arg type="b" name="result" direction="out" />
- </method>
-
- <!-- Creates a new entry for a file in tracker's database. This
- method is ueful when you want to tell Tracker about a file
- which it cannot see (EG a VFS file) or the file is located
- outside the watch/crawl path.
- -->
- <method name="Create">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="b" name="is_directory" direction="in" />
- <arg type="s" name="mime" direction="in" />
- <arg type="i" name="size" direction="in" />
- <arg type="i" name="mtime" direction="in" />
- </method>
-
- <!-- Removes the file entry from tracker's database. -->
- <method name="Delete">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="uri" direction="in" />
- </method>
-
- <!-- Get the Service subtype for the file. -->
- <method name="GetServiceType">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="s" name="service_type" direction="out" />
- </method>
-
- <!-- Get the "File.Content" field for a file and allows you to
- specify the offset and amount of text to retrieve.
- -->
- <method name="GetTextContents">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_length" direction="in" />
- <arg type="s" name="content" direction="out" />
- </method>
-
- <!-- Retrieves a chunk of matching text of specified length that
- contains the search text in the File.Content field.
- -->
- <method name="SearchTextContents">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="s" name="text" direction="in" />
- <arg type="i" name="length" direction="in" />
- <arg type="s" name="result" direction="out" />
- </method>
-
- <!-- Retrieves all files that match a service description. -->
- <method name="GetByServiceType">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="s" name="file_service" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- Retrieves all non-vfs files of the specified mime type(s). -->
- <method name="GetByMimeType">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="as" name="mime_types" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- Retrieves all vfs files of the specified mime type(s). -->
- <method name="GetByMimeTypeVfs">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="as" name="mime_types" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- returns mtime of file in seconds since epoch -->
- <method name="GetMTime">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="uri" direction="in" />
- <arg type="i" name="result" direction="out" />
- </method>
-
- <!-- Retrieves all non-vfs files in a folder complete with all
- requested metadata fields. StringArray output is [uri,
- field1, field2...].
- -->
- <method name="GetMetadataForFilesInFolder">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="fields" direction="in" />
- <arg type="aas" name="values" direction="out" />
- </method>
-
- <!-- Specific calls for Nautilus, mostly used by Nautilus search. -->
- <method name="SearchByTextAndMime">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="text" direction="in" />
- <arg type="as" name="mimes" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
- <method name="SearchByTextAndLocation">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="text" direction="in" />
- <arg type="s" name="location" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
- <method name="SearchByTextAndMimeAndLocation">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <arg type="s" name="text" direction="in" />
- <arg type="as" name="mimes" direction="in" />
- <arg type="s" name="location" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
--->
- <!-- End deprecated calls section. -->
- </interface>
-</node>
diff --git a/data/dbus/tracker-keywords.xml b/data/dbus/tracker-keywords.xml
deleted file mode 100644
index 2ac7b9e..0000000
--- a/data/dbus/tracker-keywords.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/">
- <!-- Calls for tags/keywords for any service object or file. -->
- <interface name="org.freedesktop.Tracker.Keywords">
-
- <!-- Gets a list of all unique keywords/tags that are in use by
- the specified service irrespective of the uri or id of the
- entity. Returns an array of string arrays in format [Keyword,
- KeywordCount].
- -->
- <method name="GetList">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="aas" name="keywords" direction="out" />
- </method>
-
- <!-- Gets all unique keywords/tags for specified service and id. -->
- <method name="Get">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="keywords" direction="out" />
- </method>
-
- <!-- Adds new keywords/tags for specified service and id -->
- <method name="Add">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="keywords" direction="in" />
- </method>
-
- <!-- Removes all specified keywords/tags for specified service and
- id.
- -->
- <method name="Remove">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="keywords" direction="in" />
- </method>
-
- <!-- Removes all keywords/tags for specified service and id. -->
- <method name="RemoveAll">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- </method>
-
- <!-- Searches specified service for matching keyword/tag and
- returns an array of matching id values for the service.
- -->
- <method name="Search">
- <annotation name="org.freedesktop.DBus.Deprecated" value="true"/>
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="s" name="service_type" direction="in" />
- <arg type="as" name="keywords" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- emitted whenever tags on an entity change -->
- <signal name="KeywordAdded">
- <arg type="s" name="service"/>
- <arg type="s" name="uri" />
- <arg type="s" name="keyword" />
- </signal>
-
- <signal name="KeywordRemoved">
- <arg type="s" name="service"/>
- <arg type="s" name="uri" />
- <arg type="s" name="keyword" />
- </signal>
- </interface>
-</node>
diff --git a/data/dbus/tracker-metadata.xml b/data/dbus/tracker-metadata.xml
deleted file mode 100644
index 5afb489..0000000
--- a/data/dbus/tracker-metadata.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/org/freedesktop/Tracker">
- <interface name="org.freedesktop.Tracker.Metadata">
-
- <!-- Retrieves an array of metadata values for the specified array
- of metadata keys for a service and id pair.
- -->
- <method name="Get">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="keys" direction="in" />
- <arg type="as" name="metadata" direction="out" />
- </method>
-
- <!-- Retrieves all known metadata of the service/uri in an array of
- key,value
- -->
- <method name="GetAll">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="aas" name="metadata" direction="out" />
- </method>
-
- <!-- Retrieves an array of metadata values for the specified array
- of metadata keys for services and id pair.
- -->
- <method name="GetMultiple">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="as" name="uris" direction="in" />
- <arg type="as" name="keys" direction="in" />
- <arg type="aas" name="metadata" direction="out" />
- </method>
-
- <!-- Sets specified metadata keys to the specified metadata values
- for a service and id pair.
- -->
- <method name="Set">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="s" name="uri" direction="in" />
- <arg type="as" name="keys" direction="in" />
- <arg type="as" name="metadata" direction="in" />
- </method>
-
- <!-- Gets all details of a named metadata type (e.g. "Video:FrameRate" or "Audio:Title").
- data_type: keyword, index, fulltext, string, integer, dobule, date, blob, struct, link
- -->
- <method name="GetTypeDetails">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="metadata" direction="in" />
- <arg type="s" name="data_type" direction="out" />
- <arg type="b" name="is_embedded" direction="out" />
- <arg type="b" name="is_writable" direction="out" />
- </method>
-
- <!-- Returns an array of all metadata types that are registered
- for a certain service type. You can enter "*" as the service type to get all
- registered metadata types .
- -->
- <method name="GetRegisteredTypes">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service_type" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- Returns an array of all service types that are registered.
- -->
- <method name="GetRegisteredClasses">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="as" name="result" direction="out" />
- </method>
-
- </interface>
-</node>
diff --git a/data/dbus/tracker-search.xml b/data/dbus/tracker-search.xml
index e0d73f8..31c00bb 100644
--- a/data/dbus/tracker-search.xml
+++ b/data/dbus/tracker-search.xml
@@ -5,48 +5,6 @@
-->
<node name="/org/freedesktop/Tracker">
<interface name="org.freedesktop.Tracker.Search">
- <!-- Returns no of hits for the search_text on the servce. -->
- <method name="GetHitCount">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="service" direction="in" />
- <arg type="s" name="search_text" direction="in" />
- <arg type="i" name="result" direction="out" />
- </method>
-
- <!-- returns [service name, no. of hits] for the search_text -->
- <method name="GetHitCountAll">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="s" name="search_text" direction="in" />
- <arg type="aas" name="result" direction="out" />
- </method>
-
- <!-- searches specified service for entities that match the
- specified search_text. Returns uri of all hits.
- -->
- <method name="Text">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="s" name="service" direction="in" />
- <arg type="s" name="search_text" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="as" name="result" direction="out" />
- </method>
-
- <!-- More detailed version of above. Searches specified service
- for entities that match the specified search_text. Returns
- hits in array format [uri, service, mime].
- -->
- <method name="TextDetailed">
- <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
- <arg type="i" name="live_query_id" direction="in" />
- <arg type="s" name="service" direction="in" />
- <arg type="s" name="search_text" direction="in" />
- <arg type="i" name="offset" direction="in" />
- <arg type="i" name="max_hits" direction="in" />
- <arg type="aas" name="result" direction="out" />
- </method>
-
<!-- Returns a search snippet of text with matchinhg text enclosed
in bold tags.
-->
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index 305195c..b99a3a2 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -15,7 +15,6 @@ endif
man_MANS = \
tracker-extract.1 \
tracker-files.1 \
- tracker-meta-folder.1 \
tracker-search.1 \
tracker-stats.1 \
trackerd.1 \
diff --git a/docs/manpages/tracker-meta-folder.1 b/docs/manpages/tracker-meta-folder.1
deleted file mode 100644
index f0abddc..0000000
--- a/docs/manpages/tracker-meta-folder.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH tracker-meta-folder 1 "July, 2007" GNU "User Commands"
-
-.SH NAME
-tracker-meta-folder \- return list of files indexed by tracker for a
-folder with their value for the selected properties
-
-.SH SYNOPSIS
-.B tracker-meta-folder
-\-p FOLDER [Properties]
-
-.SH DESCRIPTION
-.B tracker-meta-folder
-shows in stdout the list of files and their values for the selected
-properties indexed by tracker and stored under the
-folder provided as parameter.
-
-.SH OPTIONS
-.TP
-\-p FOLDER
-The path you are asking for.
-
-.TP
-PROPERTIES
-A list of properties to show per file. For more information on valid
-properties see
-.BR tracker-services (1).
-
-.SH EXAMPLES
-.TP
-The mimetypes of all the files in the test/ folder:
-.BR
-$ tracker-meta-folder /x/y/test File:Mime
-
-.SH SEE ALSO
-.BR trackerd (1).
-.BR tracker-services (1)
diff --git a/src/libtracker-gtk/tracker-keyword-store.c b/src/libtracker-gtk/tracker-keyword-store.c
index d465bf5..8a5be2e 100644
--- a/src/libtracker-gtk/tracker-keyword-store.c
+++ b/src/libtracker-gtk/tracker-keyword-store.c
@@ -66,11 +66,14 @@ tracker_keyword_store_init (TrackerKeywordStore *store)
store->keywords = g_hash_table_new (g_str_hash, g_str_equal);
store->tracker_client = tracker_connect (TRUE);
+ /* TODO: Port to SPARQL */
+#if 0
//populate the liststore asyncronously
tracker_keywords_get_list_async (store->tracker_client,
SERVICE_FILES,
tracker_keyword_store_populate_cb,
store);
+#endif
}
static gboolean
diff --git a/src/libtracker-gtk/tracker-metadata-tile.c b/src/libtracker-gtk/tracker-metadata-tile.c
index 9c33101..9e9e090 100644
--- a/src/libtracker-gtk/tracker-metadata-tile.c
+++ b/src/libtracker-gtk/tracker-metadata-tile.c
@@ -948,6 +948,8 @@ tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
gtk_widget_hide (priv->image);
}
+ /* TODO: Port to SPARQL */
+#if 0
/* call correct function according to service type */
switch (service_type) {
@@ -1027,7 +1029,7 @@ tracker_metadata_tile_set_uri (TrackerMetadataTile *tile, const gchar *uri,
break;
}
-
+#endif
if (uri) {
diff --git a/src/libtracker-gtk/tracker-tag-bar.c b/src/libtracker-gtk/tracker-tag-bar.c
index d062945..35e0bef 100644
--- a/src/libtracker-gtk/tracker-tag-bar.c
+++ b/src/libtracker-gtk/tracker-tag-bar.c
@@ -171,12 +171,15 @@ remove_tag_activate_cb(GtkMenuItem *menu_item, TrackerTagBar *bar)
args[0] = g_strdup (priv->active_tag);
+ /* TODO: Port to SPARQL */
+#if 0
tracker_keywords_remove(priv->client, priv->type, priv->uri,
args, &error);
if (error) {
g_print ("Tag Removal Error : %s", error->message);
return;
}
+#endif
gchar *temp = g_strdup (priv->uri);
tracker_tag_bar_set_uri (bar, priv->type, temp);
g_free (temp);
@@ -211,12 +214,15 @@ _on_apply_add_tag (GtkButton *but, TrackerTagBar *bar)
tags = g_strsplit (text, ",", 0);
+ /* TODO: Port to SPARQL */
+#if 0
tracker_keywords_add(priv->client, priv->type, priv->uri,
tags, &error);
if (error) {
g_print ("Tag Addition Error : %s", error->message);
return;
}
+#endif
}
_on_close_add_tag (but, bar);
@@ -326,9 +332,12 @@ tracker_tag_bar_set_uri (TrackerTagBar *bar, ServiceType type, const gchar *uri)
priv->uri = g_strdup (uri);
priv->type = type;
+ /* TODO: Port to SPARQL */
+#if 0
tracker_keywords_get_async (priv->client, priv->type, uri,
(TrackerArrayReply)_keywords_reply,
bar);
+#endif
}
/* TRACKER TAG BAR NEW */
diff --git a/src/libtracker-gtk/tracker-utils.c b/src/libtracker-gtk/tracker-utils.c
index 495406c..816da9a 100644
--- a/src/libtracker-gtk/tracker-utils.c
+++ b/src/libtracker-gtk/tracker-utils.c
@@ -51,6 +51,8 @@ tracker_get_all_keywords (TrackerClient *tracker_client)
GList *list = NULL;
GError *error = NULL;
+ /* TODO: Port to SPARQL */
+#if 0
out_array = tracker_keywords_get_list (tracker_client, SERVICE_FILES, &error);
if (!error && out_array) {
@@ -66,6 +68,7 @@ tracker_get_all_keywords (TrackerClient *tracker_client)
}
g_ptr_array_free (out_array, TRUE);
}
+#endif
g_clear_error (&error);
diff --git a/src/libtracker/Makefile.am b/src/libtracker/Makefile.am
index a913855..498f3cf 100644
--- a/src/libtracker/Makefile.am
+++ b/src/libtracker/Makefile.am
@@ -28,9 +28,6 @@ include_HEADERS = \
# Generate DBus files from XML data.
dbus_sources = \
tracker-daemon-glue.h \
- tracker-files-glue.h \
- tracker-keywords-glue.h \
- tracker-metadata-glue.h \
tracker-search-glue.h
%-glue.h: $(top_srcdir)/data/dbus/%.xml
diff --git a/src/libtracker/tracker.c b/src/libtracker/tracker.c
index 62d3ce2..db1e3e3 100644
--- a/src/libtracker/tracker.c
+++ b/src/libtracker/tracker.c
@@ -24,18 +24,12 @@
#include "tracker.h"
#include "tracker-daemon-glue.h"
-#include "tracker-files-glue.h"
-#include "tracker-keywords-glue.h"
-#include "tracker-metadata-glue.h"
#include "tracker-search-glue.h"
#define TRACKER_SERVICE "org.freedesktop.Tracker"
#define TRACKER_OBJECT "/org/freedesktop/Tracker"
#define TRACKER_INTERFACE "org.freedesktop.Tracker"
-#define TRACKER_INTERFACE_METADATA "org.freedesktop.Tracker.Metadata"
-#define TRACKER_INTERFACE_KEYWORDS "org.freedesktop.Tracker.Keywords"
#define TRACKER_INTERFACE_SEARCH "org.freedesktop.Tracker.Search"
-#define TRACKER_INTERFACE_FILES "org.freedesktop.Tracker.Files"
#define TRACKER_INTERFACE_MUSIC "org.freedesktop.Tracker.Music"
#define TRACKER_INTERFACE_PLAYLISTS "org.freedesktop.Tracker.PlayLists"
@@ -288,33 +282,11 @@ tracker_connect (gboolean enable_warnings)
proxy = dbus_g_proxy_new_for_name (connection,
TRACKER_SERVICE,
- TRACKER_OBJECT "/Metadata",
- TRACKER_INTERFACE_METADATA);
-
- client->proxy_metadata = proxy;
-
- proxy = dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
- TRACKER_OBJECT "/Keywords",
- TRACKER_INTERFACE_KEYWORDS);
-
- client->proxy_keywords = proxy;
-
- proxy = dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
TRACKER_OBJECT "/Search",
TRACKER_INTERFACE_SEARCH);
client->proxy_search = proxy;
- proxy = dbus_g_proxy_new_for_name (connection,
- TRACKER_SERVICE,
- TRACKER_OBJECT "/Files",
- TRACKER_INTERFACE_FILES);
-
- client->proxy_files = proxy;
-
-
return client;
@@ -324,15 +296,9 @@ void
tracker_disconnect (TrackerClient *client)
{
g_object_unref (client->proxy);
- g_object_unref (client->proxy_metadata);
- g_object_unref (client->proxy_keywords);
g_object_unref (client->proxy_search);
- g_object_unref (client->proxy_files);
client->proxy = NULL;
- client->proxy_metadata = NULL;
- client->proxy_keywords = NULL;
client->proxy_search = NULL;
- client->proxy_files = NULL;
g_free (client);
}
@@ -369,22 +335,6 @@ tracker_get_status (TrackerClient *client, GError **error)
}
-GHashTable *
-tracker_get_services (TrackerClient *client, gboolean main_services_only, GError **error)
-{
- GHashTable *table;
-
- if (!org_freedesktop_Tracker_get_services (client->proxy, main_services_only, &table, &*error)) {
- return NULL;
- }
-
- return table;
-
-
-}
-
-
-
GPtrArray *
tracker_get_stats (TrackerClient *client, GError **error)
{
@@ -427,249 +377,6 @@ tracker_prompt_index_signals (TrackerClient *client, GError **error)
}
-
-char **
-tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, const char **keys, GError **error)
-{
- char **array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Metadata_get (client->proxy_metadata, service_str, id, keys, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-GPtrArray *
-tracker_metadata_get_multiple (TrackerClient *client, ServiceType service, const char **ids, const char **keys, GError **error)
-{
- GPtrArray *array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Metadata_get_multiple (client->proxy_metadata, service_str, ids, keys, &array, error)) {
- return NULL;
- }
-
- return array;
-}
-
-GPtrArray *
-tracker_metadata_get_all (TrackerClient *client, ServiceType service, const gchar *uri, GError **error)
-{
- const gchar *service_str = tracker_service_types[service];
- GPtrArray *response = NULL;
-
- if (!org_freedesktop_Tracker_Metadata_get_all (client->proxy_metadata, service_str, uri, &response, &*error)) {
- return NULL;
- }
-
- return response;
-}
-
-void
-tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, GError **error)
-{
- const char *service_str = tracker_service_types[service];
-
- org_freedesktop_Tracker_Metadata_set (client->proxy_metadata, service_str, id, keys, (const char **)values, &*error);
-
-}
-
-
-
-void
-tracker_metadata_register_type (TrackerClient *client, const char *name, MetadataTypes type, GError **error)
-{
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
-}
-
-MetaDataTypeDetails *
-tracker_metadata_get_type_details (TrackerClient *client, const char *name, GError **error)
-{
-
- MetaDataTypeDetails *details = g_new (MetaDataTypeDetails, 1);
-
- if (!org_freedesktop_Tracker_Metadata_get_type_details (client->proxy_metadata, name, &details->type, &details->is_embedded, &details->is_writeable, &*error)) {
- g_free (details);
- return NULL;
- }
-
- return details;
-
-}
-
-
-char **
-tracker_metadata_get_registered_types (TrackerClient *client, const char *class, GError **error)
-{
- char **array = NULL;
-
- if (!org_freedesktop_Tracker_Metadata_get_registered_types (client->proxy_metadata, class, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-char **
-tracker_metadata_get_writeable_types (TrackerClient *client, const char *class, GError **error)
-{
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
-
- return NULL;
-}
-
-
-
-char **
-tracker_metadata_get_registered_classes (TrackerClient *client, GError **error)
-{
- char **array = NULL;
-
- if (!org_freedesktop_Tracker_Metadata_get_registered_classes (client->proxy_metadata, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-
-GPtrArray *
-tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error)
-{
- GPtrArray *table;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Keywords_get_list (client->proxy_keywords,service_str, &table, &*error)) {
- return NULL;
- }
-
- return table;
-
-
-}
-
-
-char **
-tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error)
-{
- char **array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Keywords_get (client->proxy_keywords, service_str, id, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-
-void
-tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error)
-{
- const char *service_str = tracker_service_types[service];
-
- org_freedesktop_Tracker_Keywords_add (client->proxy_keywords, service_str, id, (const char **)values, &*error);
-}
-
-
-
-void
-tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error)
-{
- const char *service_str = tracker_service_types[service];
-
- org_freedesktop_Tracker_Keywords_remove (client->proxy_keywords, service_str, id, (const char **)values, &*error);
-}
-
-
-
-void
-tracker_keywords_remove_all (TrackerClient *client, ServiceType service, const char *id, GError **error)
-{
- const char *service_str = tracker_service_types[service];
-
- org_freedesktop_Tracker_Keywords_remove_all (client->proxy_keywords, service_str, id, &*error);
-}
-
-
-char **
-tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error)
-{
- char **array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Keywords_search (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-
-}
-
-
-int
-tracker_search_get_hit_count (TrackerClient *client, ServiceType service, const char *search_text, GError **error)
-{
-
- int count = 0;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Search_get_hit_count (client->proxy_search, service_str, search_text, &count, &*error)) {
- return 0;
- }
-
- return count;
-
-}
-
-
-GPtrArray *
-tracker_search_get_hit_count_all (TrackerClient *client, const char *search_text, GError **error)
-{
-
- GPtrArray *array;
-
- if (!org_freedesktop_Tracker_Search_get_hit_count_all (client->proxy_search, search_text, &array, &*error)) {
- return NULL;
- }
-
- return array;
-
-}
-
-char **
-tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
-{
- char **array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Search_text (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-GPtrArray *
-tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error)
-{
- GPtrArray *array;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Search_text_detailed (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
char *
tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error)
{
@@ -697,179 +404,6 @@ tracker_search_suggest (TrackerClient *client, const char *search_term, int maxd
}
-
-void
-tracker_files_create (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, GError **error)
-{
- org_freedesktop_Tracker_Files_create (client->proxy_files, uri, is_directory, mime, size, mtime, &*error);
-}
-
-
-void
-tracker_files_delete (TrackerClient *client, const char *uri, GError **error)
-{
- org_freedesktop_Tracker_Files_delete (client->proxy_files, uri, &*error);
-}
-
-
-char *
-tracker_files_get_text_contents (TrackerClient *client, const char *uri, int offset, int max_length, GError **error)
-{
- char *result;
-
- if (!org_freedesktop_Tracker_Files_get_text_contents (client->proxy_files, uri, offset, max_length, &result, &*error)) {
- return NULL;
- }
-
- return result;
-
-}
-
-
-
-char *
-tracker_files_search_text_contents (TrackerClient *client, const char *uri, const char *search_text, int length, GError **error)
-{
- char *result;
-
- if (!org_freedesktop_Tracker_Files_search_text_contents (client->proxy_files, uri, search_text, length, &result, &*error)) {
- return NULL;
- }
-
- return result;
-}
-
-
-
-char **
-tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error)
-{
- char **array = NULL;
- const char *service_str = tracker_service_types[service];
-
- if (!org_freedesktop_Tracker_Files_get_by_service_type (client->proxy_files, live_query_id, service_str, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-
-char **
-tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error)
-{
- char **array = NULL;
-
- if (!org_freedesktop_Tracker_Files_get_by_mime_type (client->proxy_files, live_query_id, (const char **)mimes, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-
-char **
-tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error)
-{
- char **array = NULL;
-
- if (!org_freedesktop_Tracker_Files_get_by_mime_type_vfs (client->proxy_files, live_query_id,(const char **) mimes, offset, max_hits, &array, &*error)) {
- return NULL;
- }
-
- return array;
-}
-
-
-
-int
-tracker_files_get_mtime (TrackerClient *client, const char *uri, GError **error)
-{
- int result;
-
- if (!org_freedesktop_Tracker_Files_get_mtime (client->proxy_files, uri, &result, &*error)) {
- return 0;
- }
-
- return result;
-}
-
-
-GPtrArray *
-tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, char **fields, GError **error)
-{
- GPtrArray *table;
-
- if (!org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder (client->proxy_files, live_query_id, uri, (const char **)fields, &table, &*error)) {
- return NULL;
- }
-
- return table;
-}
-
-
-
-char **
-tracker_search_metadata_by_text (TrackerClient *client, const char *query, GError **error)
-{
-
- char **array = NULL;
-
- if (!org_freedesktop_Tracker_Search_text (client->proxy_search, -1, "Files", query, 0, 512, &array, &*error)) {
- return NULL;
- }
-
- return array;
-
-}
-
-/* asynchronous calls */
-
-
-
-char **
-tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_mime (client->proxy_files, query,(const char **) mimes, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
-}
-
-
-char **
-tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location (client->proxy_files, query, (const char **)mimes, location, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
-}
-
-
-
-char **
-tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error)
-{
- char **strs;
-
- if (!org_freedesktop_Tracker_Files_search_by_text_and_location (client->proxy_files, query, location, &strs, &*error)) {
- return NULL;
- }
- return strs;
-
-}
-
-
-
void
tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data)
{
@@ -899,22 +433,6 @@ tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gp
}
-
-
-void
-tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data)
-{
- HashTableCallBackStruct *callback_struct;
-
- callback_struct = g_new (HashTableCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_get_services_async (client->proxy, main_services_only, tracker_hashtable_reply, callback_struct);
-
-}
-
-
void
tracker_get_stats_async (TrackerClient *client, TrackerGPtrArrayReply callback, gpointer user_data)
{
@@ -981,307 +499,6 @@ tracker_prompt_index_signals_async (TrackerClient *client, TrackerVoidReply call
}
-
-
-
-
-void
-tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_get_async (client->proxy_metadata, service_str, id, keys, tracker_array_reply, callback_struct);
-
-}
-
-
-void
-tracker_metadata_get_multiple_async (TrackerClient *client, ServiceType service, const char **ids, const char **keys, TrackerGPtrArrayReply callback, gpointer user_data)
-{
- GPtrArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (GPtrArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_get_multiple_async (client->proxy_metadata, service_str, ids, keys, tracker_GPtrArray_reply, callback_struct);
-
-}
-
-
-void
-tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_set_async (client->proxy_metadata, service_str, id, keys, (const char **)values, tracker_void_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
-
- tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
-}
-
-
-
-
-void
-tracker_metadata_get_registered_types_async (TrackerClient *client, const char *class, TrackerArrayReply callback, gpointer user_data)
-{
-
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_get_registered_types_async (client->proxy_metadata, class, tracker_array_reply, callback_struct);
-}
-
-
-void
-tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *class, TrackerArrayReply callback, gpointer user_data)
-{
-
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
-
- /* This does nothing now, this API has been removed */
- g_warning ("%s no longer does anything", __FUNCTION__);
-
- tracker_void_reply (client->proxy_metadata, NULL, callback_struct);
-}
-
-
-
-void
-tracker_metadata_get_registered_classes_async (TrackerClient *client, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
-
- client->last_pending_call = org_freedesktop_Tracker_Metadata_get_registered_classes_async (client->proxy_metadata, tracker_array_reply, callback_struct);
-
-}
-
-
-void
-tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data)
-{
-
- GPtrArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (GPtrArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Keywords_get_list_async (client->proxy_keywords, service_str, tracker_GPtrArray_reply, callback_struct);
-
-
-}
-
-
-void
-tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data)
-{
-
- ArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Keywords_get_async (client->proxy_keywords, service_str, id, tracker_array_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
- client->last_pending_call = org_freedesktop_Tracker_Keywords_add_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct);
-}
-
-
-
-void
-tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_async (client->proxy_keywords, service_str, id, (const char **)values, tracker_void_reply, callback_struct);
-}
-
-
-
-void
-tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Keywords_remove_all_async (client->proxy_keywords, service_str, id, tracker_void_reply, callback_struct);
-}
-
-
-void
-tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
-{
-
- ArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, live_query_id, service_str, (const char **)keywords, offset, max_hits, tracker_array_reply, callback_struct);
-
-}
-
-
-void
-tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data)
-{
- const char *service_str = tracker_service_types[service];
- IntCallBackStruct *callback_struct;
-
- callback_struct = g_new (IntCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Search_get_hit_count_async (client->proxy_search, service_str, search_text, tracker_int_reply, callback_struct);
-
-
-}
-
-
-void
-tracker_search_text_get_hit_count_all_async (TrackerClient *client, const char *search_text, TrackerGPtrArrayReply callback, gpointer user_data)
-{
-
- GPtrArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (GPtrArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Search_get_hit_count_all_async (client->proxy_search, search_text, tracker_GPtrArray_reply, callback_struct);
-
-
-}
-
-void
-tracker_search_text_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
-{
-
- ArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Search_text_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_array_reply, callback_struct);
-
-}
-
-
-void
-tracker_search_text_detailed_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data)
-{
-
- GPtrArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (GPtrArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Search_text_detailed_async (client->proxy_search, live_query_id, service_str, search_text, offset, max_hits, tracker_GPtrArray_reply, callback_struct);
-
-}
-
-
void
tracker_search_get_snippet_async (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, TrackerStringReply callback, gpointer user_data)
{
@@ -1313,205 +530,3 @@ tracker_search_suggest_async (TrackerClient *client, const char *search_text, in
}
-
-void
-tracker_files_create_async (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, TrackerVoidReply callback, gpointer user_data)
-{
- VoidCallBackStruct *callback_struct;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_create_async (client->proxy_files, uri, is_directory, mime, size, mtime, tracker_void_reply, callback_struct);
-}
-
-
-void
-tracker_files_delete_async (TrackerClient *client, const char *uri, TrackerVoidReply callback, gpointer user_data)
-{
-
- VoidCallBackStruct *callback_struct;
-
- callback_struct = g_new (VoidCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_delete_async (client->proxy_files, uri, tracker_void_reply, callback_struct);
-}
-
-
-void
-tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data)
-{
- StringCallBackStruct *callback_struct;
-
- callback_struct = g_new (StringCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_text_contents_async (client->proxy_files, uri, offset, max_length, tracker_string_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data)
-{
-
- StringCallBackStruct *callback_struct;
-
- callback_struct = g_new (StringCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_search_text_contents_async (client->proxy_files, uri, search_text, length, tracker_string_reply, callback_struct);
-
-
-}
-
-
-
-void
-tracker_files_get_by_service_type_async (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
- const char *service_str;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- service_str = tracker_service_types[service];
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_by_service_type_async (client->proxy_files, live_query_id, service_str, offset, max_hits, tracker_array_reply, callback_struct);
-}
-
-
-
-void
-tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_async (client->proxy_files, live_query_id, (const char **)mimes, offset, max_hits, tracker_array_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_by_mime_type_vfs_async (client->proxy_files, live_query_id,(const char **) mimes, offset, max_hits, tracker_array_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data)
-{
-
- IntCallBackStruct *callback_struct;
-
- callback_struct = g_new (IntCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_mtime_async (client->proxy_files, uri, tracker_int_reply, callback_struct);
-
-}
-
-
-void
-tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data)
-{
- GPtrArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (GPtrArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_get_metadata_for_files_in_folder_async (client->proxy_files, live_query_id, uri, (const char **)fields, tracker_GPtrArray_reply, callback_struct);
-
-
-}
-
-
-void
-tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
- char *metadata;
- char *keywords[2];
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- if (strchr (query, ':') != NULL) {
- metadata = strtok ((char *)query, ":");
- if(strcoll(metadata,"tag") == 0){
- keywords[0] = strtok (NULL, ":");
- keywords[1] = NULL;
- client->last_pending_call = org_freedesktop_Tracker_Keywords_search_async (client->proxy_keywords, -1, "Files", (const char **)keywords, 0, 512, tracker_array_reply, callback_struct);
- }
- }else{
- client->last_pending_call = org_freedesktop_Tracker_Search_text_async (client->proxy_search, -1, "Files", query, 0, 512, tracker_array_reply, callback_struct);
- }
-}
-
-void
-tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_async (client->proxy_files, query,(const char **) mimes, tracker_array_reply, callback_struct);
-
-}
-
-
-void
-tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const char **mimes, const char *location, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_mime_and_location_async (client->proxy_files, query, (const char **)mimes, location, tracker_array_reply, callback_struct);
-
-}
-
-
-
-void
-tracker_search_metadata_by_text_and_location_async (TrackerClient *client, const char *query, const char *location, TrackerArrayReply callback, gpointer user_data)
-{
- ArrayCallBackStruct *callback_struct;
-
- callback_struct = g_new (ArrayCallBackStruct, 1);
- callback_struct->callback = callback;
- callback_struct->data = user_data;
-
- client->last_pending_call = org_freedesktop_Tracker_Files_search_by_text_and_location_async (client->proxy_files, query, location, tracker_array_reply, callback_struct);
-
-}
-
diff --git a/src/libtracker/tracker.h b/src/libtracker/tracker.h
index 50d8ae7..cc9a4a5 100644
--- a/src/libtracker/tracker.h
+++ b/src/libtracker/tracker.h
@@ -86,10 +86,7 @@ typedef struct {
typedef struct {
DBusGProxy *proxy;
- DBusGProxy *proxy_metadata;
- DBusGProxy *proxy_keywords;
DBusGProxy *proxy_search;
- DBusGProxy *proxy_files;
DBusGProxyCall *last_pending_call;
} TrackerClient;
@@ -110,7 +107,6 @@ char * tracker_type_to_service_name (ServiceType s);
int tracker_get_version (TrackerClient *client, GError **error);
char * tracker_get_status (TrackerClient *client, GError **error);
-GHashTable * tracker_get_services (TrackerClient *client, gboolean main_services_only, GError **error);
GPtrArray * tracker_get_stats (TrackerClient *client, GError **error);
void tracker_set_bool_option (TrackerClient *client, const char *option, gboolean value, GError **error);
@@ -118,58 +114,13 @@ void tracker_set_int_option (TrackerClient *client, const char *option, int
void tracker_shutdown (TrackerClient *client, gboolean reindex, GError **error);
void tracker_prompt_index_signals (TrackerClient *client, GError **error);
-char ** tracker_metadata_get (TrackerClient *client, ServiceType service, const char *id, const char **keys, GError **error);
-GPtrArray * tracker_metadata_get_multiple (TrackerClient *client, ServiceType service, const char **ids, const char **keys, GError **error);
-GPtrArray * tracker_metadata_get_all (TrackerClient *client, ServiceType service, const gchar *uri, GError **error);
-void tracker_metadata_set (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, GError **error);
-void tracker_metadata_register_type (TrackerClient *client, const char *name, MetadataTypes type, GError **error);
-MetaDataTypeDetails * tracker_metadata_get_type_details (TrackerClient *client, const char *name, GError **error);
-char ** tracker_metadata_get_registered_types (TrackerClient *client, const char *classname, GError **error);
-char ** tracker_metadata_get_writeable_types (TrackerClient *client, const char *classname, GError **error);
-char ** tracker_metadata_get_registered_classes (TrackerClient *client, GError **error);
-
-GPtrArray * tracker_keywords_get_list (TrackerClient *client, ServiceType service, GError **error);
-char ** tracker_keywords_get (TrackerClient *client, ServiceType service, const char *id, GError **error);
-void tracker_keywords_add (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error);
-void tracker_keywords_remove (TrackerClient *client, ServiceType service, const char *id, char **values, GError **error);
-void tracker_keywords_remove_all (TrackerClient *client, ServiceType service, const char *id, GError **error);
-char ** tracker_keywords_search (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, GError **error);
-
-
-int tracker_search_get_hit_count (TrackerClient *client, ServiceType service, const char *search_text, GError **error);
-GPtrArray * tracker_search_get_hit_count_all (TrackerClient *client, const char *search_text, GError **error);
-char ** tracker_search_text (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error);
-GPtrArray * tracker_search_text_detailed (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, GError **error);
char * tracker_search_get_snippet (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, GError **error);
gchar * tracker_search_suggest (TrackerClient *client, const char *search_text, int maxdist, GError **error);
-
-void tracker_files_create (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, GError **error);
-void tracker_files_delete (TrackerClient *client, const char *uri, GError **error);
-char * tracker_files_get_text_contents (TrackerClient *client, const char *uri, int offset, int max_length, GError **error);
-char * tracker_files_search_text_contents (TrackerClient *client, const char *uri, const char *search_text, int length, GError **error);
-char ** tracker_files_get_by_service_type (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, GError **error);
-char ** tracker_files_get_by_mime_type (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error);
-char ** tracker_files_get_by_mime_type_vfs (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, GError **error);
-
-int tracker_files_get_mtime (TrackerClient *client, const char *uri, GError **error);
-GPtrArray * tracker_files_get_metadata_for_files_in_folder (TrackerClient *client, int live_query_id, const char *uri, char **fields, GError **error);
-
-
-/* Deprecated calls - Following API specific for nautilus search use only */
-char ** tracker_search_metadata_by_text (TrackerClient *client, const char *query, GError **error);
-char ** tracker_search_metadata_by_text_and_mime (TrackerClient *client, const char *query, const char **mimes, GError **error);
-char ** tracker_search_metadata_by_text_and_mime_and_location (TrackerClient *client, const char *query, const char **mimes, const char *location, GError **error);
-char ** tracker_search_metadata_by_text_and_location (TrackerClient *client, const char *query, const char *location, GError **error);
-/* end deprecated call list */
-
-
/* asynchronous calls */
-
void tracker_get_version_async (TrackerClient *client, TrackerIntReply callback, gpointer user_data);
void tracker_get_status_async (TrackerClient *client, TrackerStringReply callback, gpointer user_data);
-void tracker_get_services_async (TrackerClient *client, gboolean main_services_only, TrackerHashTableReply callback, gpointer user_data);
void tracker_get_stats_async (TrackerClient *client, TrackerGPtrArrayReply callback, gpointer user_data);
void tracker_set_bool_option_async (TrackerClient *client, const char *option, gboolean value, TrackerVoidReply callback, gpointer user_data);
@@ -177,48 +128,9 @@ void tracker_set_int_option_async (TrackerClient *client, const char *option
void tracker_shutdown_async (TrackerClient *client, gboolean reindex, TrackerVoidReply callback, gpointer user_data);
void tracker_prompt_index_signals_async (TrackerClient *client, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_get_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_get_multiple_async (TrackerClient *client, ServiceType service, const char **ids, const char **keys, TrackerGPtrArrayReply callback, gpointer user_data);
-void tracker_metadata_set_async (TrackerClient *client, ServiceType service, const char *id, const char **keys, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_register_type_async (TrackerClient *client, const char *name, MetadataTypes type, TrackerVoidReply callback, gpointer user_data);
-void tracker_metadata_get_registered_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_get_writeable_types_async (TrackerClient *client, const char *classname, TrackerArrayReply callback, gpointer user_data);
-void tracker_metadata_get_registered_classes_async (TrackerClient *client, TrackerArrayReply callback, gpointer user_data);
-
-void tracker_keywords_get_list_async (TrackerClient *client, ServiceType service, TrackerGPtrArrayReply callback, gpointer user_data);
-void tracker_keywords_get_async (TrackerClient *client, ServiceType service, const char *id, TrackerArrayReply callback, gpointer user_data);
-void tracker_keywords_add_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_keywords_remove_async (TrackerClient *client, ServiceType service, const char *id, char **values, TrackerVoidReply callback, gpointer user_data);
-void tracker_keywords_remove_all_async (TrackerClient *client, ServiceType service, const char *id, TrackerVoidReply callback, gpointer user_data);
-void tracker_keywords_search_async (TrackerClient *client, int live_query_id, ServiceType service, char **keywords, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data);
-
-void tracker_search_text_get_hit_count_async (TrackerClient *client, ServiceType service, const char *search_text, TrackerIntReply callback, gpointer user_data);
-void tracker_search_text_get_hit_count_all_async (TrackerClient *client, const char *search_text, TrackerGPtrArrayReply callback, gpointer user_data);
-void tracker_search_text_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data);
-void tracker_search_text_detailed_async (TrackerClient *client, int live_query_id, ServiceType service, const char *search_text, int offset, int max_hits, TrackerGPtrArrayReply callback, gpointer user_data);
void tracker_search_get_snippet_async (TrackerClient *client, ServiceType service, const char *uri, const char *search_text, TrackerStringReply callback, gpointer user_data);
void tracker_search_suggest_async (TrackerClient *client, const char *search_text, int maxdist, TrackerStringReply callback, gpointer user_data);
-void tracker_files_create_async (TrackerClient *client, const char *uri, gboolean is_directory, const char *mime, int size, int mtime, TrackerVoidReply callback, gpointer user_data);
-void tracker_files_delete_async (TrackerClient *client, const char *uri, TrackerVoidReply callback, gpointer user_data);
-void tracker_files_get_text_contents_async (TrackerClient *client, const char *uri, int offset, int max_length, TrackerStringReply callback, gpointer user_data);
-void tracker_files_search_text_contents_async (TrackerClient *client, const char *uri, const char *search_text, int length, TrackerStringReply callback, gpointer user_data);
-void tracker_files_get_by_service_type_async (TrackerClient *client, int live_query_id, ServiceType service, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data);
-void tracker_files_get_by_mime_type_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data);
-void tracker_files_get_by_mime_type_vfs_async (TrackerClient *client, int live_query_id, char **mimes, int offset, int max_hits, TrackerArrayReply callback, gpointer user_data);
-
-void tracker_files_get_mtime_async (TrackerClient *client, const char *uri, TrackerIntReply callback, gpointer user_data);
-void tracker_files_get_metadata_for_files_in_folder_async (TrackerClient *client, int live_query_id, const char *uri, char **fields, TrackerGPtrArrayReply callback, gpointer user_data);
-
-
-
-
-/* Deprecated calls - API specific for nautilus search use only. New code should use tracker_search_metadata_matching_text_async instead */
-void tracker_search_metadata_by_text_async (TrackerClient *client, const char *query, TrackerArrayReply callback, gpointer user_data);
-void tracker_search_metadata_by_text_and_mime_async (TrackerClient *client, const char *query, const char **mimes, TrackerArrayReply callback, gpointer user_data);
-void tracker_search_metadata_by_text_and_mime_and_location_async (TrackerClient *client, const char *query, const char **mimes, const char *location, TrackerArrayReply callback, gpointer user_data);
-void tracker_search_metadata_by_text_and_location_async (TrackerClient *client, const char *query, const char *location, TrackerArrayReply callback, gpointer user_data);
-
G_END_DECLS
#endif /* TRACKER_H */
diff --git a/src/tracker-search-tool/tracker-search-tool.c b/src/tracker-search-tool/tracker-search-tool.c
index d53f3a1..6bd9b62 100644
--- a/src/tracker-search-tool/tracker-search-tool.c
+++ b/src/tracker-search-tool/tracker-search-tool.c
@@ -1776,7 +1776,10 @@ start_new_search (GSearchWindow * gsearch,
gtk_list_store_clear (service->store);
}
+ /* TODO: Port to SPARQL */
+#if 0
tracker_search_text_get_hit_count_all_async (tracker_client, query, (TrackerGPtrArrayReply) get_hit_count, gsearch);
+#endif
}
static void
@@ -1834,11 +1837,13 @@ end_search (GPtrArray * out_array,
/* update hit count after search in case of dud hits */
+ /* TODO: Port to SPARQL */
+#if 0
tracker_search_text_get_hit_count_async (tracker_client, gsearch->current_service->service_type,
gsearch->search_term,
(TrackerIntReply)end_refresh_count,
gsearch);
-
+#endif
gsearch->search_results_list_store = gsearch->current_service->store;
@@ -1897,6 +1902,9 @@ do_search (GSearchWindow * gsearch,
}
gsearch->current_service->offset = search_offset;
+
+ /* TODO: Port to SPARQL */
+#if 0
tracker_search_text_detailed_async (tracker_client,
-1,
gsearch->current_service->service_type,
@@ -1904,6 +1912,7 @@ do_search (GSearchWindow * gsearch,
search_offset, MAX_SEARCH_RESULTS,
(TrackerGPtrArrayReply)end_search,
gsearch);
+#endif
}
static GtkWidget *
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index 8f2d113..3e215f7 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -21,7 +21,6 @@ libs = \
bin_PROGRAMS = \
tracker-search \
- tracker-meta-folder \
tracker-stats \
tracker-tag \
tracker-files \
@@ -33,9 +32,6 @@ bin_PROGRAMS = \
tracker_search_SOURCES = tracker-search.c
tracker_search_LDADD = $(libs)
-tracker_meta_folder_SOURCES = tracker-meta-folder.c
-tracker_meta_folder_LDADD = $(libs)
-
tracker_stats_SOURCES = tracker-stats.c
tracker_stats_LDADD = $(libs)
diff --git a/src/tracker-utils/tracker-files.c b/src/tracker-utils/tracker-files.c
index 7e6e5aa..e9108aa 100644
--- a/src/tracker-utils/tracker-files.c
+++ b/src/tracker-utils/tracker-files.c
@@ -100,6 +100,8 @@ main (int argc, char **argv)
return EXIT_FAILURE;
}
+ /* TODO: Port to SPARQL */
+#if 0
if (service) {
gchar **array;
gchar **p;
@@ -222,6 +224,7 @@ main (int argc, char **argv)
g_strfreev (array);
}
+#endif
tracker_disconnect (client);
diff --git a/src/tracker-utils/tracker-info.c b/src/tracker-utils/tracker-info.c
index 694bef2..89ec5f2 100644
--- a/src/tracker-utils/tracker-info.c
+++ b/src/tracker-utils/tracker-info.c
@@ -175,6 +175,8 @@ main (int argc, char **argv)
count = g_strv_length (uris);
+ /* TODO: Port to SPARQL */
+#if 0
if (count > 1 && metadata != NULL) {
gchar **strv;
GPtrArray *results;
@@ -315,6 +317,7 @@ main (int argc, char **argv)
g_object_unref (file);
g_free (path);
}
+#endif
tracker_disconnect (client);
diff --git a/src/tracker-utils/tracker-meta-folder.c b/src/tracker-utils/tracker-meta-folder.c
deleted file mode 100644
index ef44a65..0000000
--- a/src/tracker-utils/tracker-meta-folder.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <stdlib.h>
-#include <time.h>
-#include <locale.h>
-
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gio/gio.h>
-
-#include <libtracker/tracker.h>
-#include <libtracker-common/tracker-common.h>
-
-#define MAX_FILENAME_WIDTH 35
-
-static gchar *path;
-static gchar **fields;
-
-static GOptionEntry entries[] = {
- { "path", 'p', 0, G_OPTION_ARG_STRING, &path,
- N_("Path to use for directory to get metadata information about"),
- NULL,
- },
- { G_OPTION_REMAINING, 0, 0,
- G_OPTION_ARG_STRING_ARRAY, &fields,
- NULL,
- N_("FIELD [FIELD...]")
- },
- { NULL }
-};
-
-static void
-print_header (gchar **fields_resolved)
-{
- gint cols;
- gint width;
- gint i;
-
- /* Headers */
- g_print (" %-*.*s ",
- MAX_FILENAME_WIDTH,
- MAX_FILENAME_WIDTH,
- _("Filename"));
-
- width = MAX_FILENAME_WIDTH;
- width += 1;
-
- cols = g_strv_length (fields_resolved);
-
- for (i = 0; i < cols; i++) {
- g_print ("%s%s",
- fields_resolved[i],
- i < cols - 1 ? ", " : "");
-
- width += g_utf8_strlen (fields_resolved[i], -1);
- width += i < cols - 1 ? 2 : 0;
- }
- g_print ("\n");
-
- /* Line under header */
- g_print (" ");
- for (i = 0; i < width; i++) {
- g_print ("-");
- }
- g_print ("\n");
-}
-
-static void
-get_meta_table_data (gpointer data,
- gpointer user_data)
-{
- gchar **meta;
- gchar **p;
- /* Compilaton warning fix Dec. 30 2008
- * If the global variable was to be used here, then this was wrong
- * if not, then this variable was unused.
- * gchar **fields; */
- gchar *basename;
- gint i;
- gint len;
- gint cols;
-
- meta = data;
- /* fields = user_data; */
-
- basename = g_path_get_basename (*meta);
- len = g_utf8_strlen (basename, -1);
- cols = g_strv_length (meta);
-
- for (p = meta, i = 0; *p; p++, i++) {
- if (i == 0) {
- g_print (" %-*.*s",
- MAX (len, MAX_FILENAME_WIDTH),
- MAX (len, MAX_FILENAME_WIDTH),
- basename);
-
- if (len > MAX_FILENAME_WIDTH) {
- gint t = 0;
-
- g_print ("\n");
- while (t++ < MAX_FILENAME_WIDTH + 2) {
- g_print (" ");
- }
- }
-
- g_print (" (");
- } else {
- g_print ("%s%s",
- *p,
- i < cols - 1 ? ", " : "");
- }
- }
-
- g_free (basename);
-
- g_print (")\n");
-}
-
-int
-main (int argc, char **argv)
-{
- TrackerClient *client;
- GOptionContext *context;
- GError *error = NULL;
- GFile *file;
- gchar *summary;
- const gchar *failed = NULL;
- gchar **fields_resolved = NULL;
- gchar *path_in_utf8, *abs_path;
- GPtrArray *array;
- gint i, j;
-
- setlocale (LC_ALL, "");
-
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- /* Translators: this messagge will apper immediately after the
- * usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>
- */
- context = g_option_context_new (_("Retrieve meta-data information about files in a directory"));
-
- /* Translators: this message will appear after the usage string
- * and before the list of options, showing an usage example.
- */
- summary = g_strconcat (_("To use multiple meta-data types simply list them, for example:"),
- "\n"
- "\n"
- " -p ", _("PATH"), " File:Size",
- NULL);
-
- g_option_context_set_summary (context, summary);
- g_option_context_add_main_entries (context, entries, NULL);
- g_option_context_parse (context, &argc, &argv, NULL);
- g_free (summary);
-
- if (!path) {
- failed = _("No path was given");
- } else if (!fields) {
- failed = _("No fields were given");
- }
-
- if (failed) {
- gchar *help;
-
- g_printerr ("%s\n\n", failed);
-
- 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);
-
- client = tracker_connect (FALSE);
-
- if (!client) {
- g_printerr ("%s\n",
- _("Could not establish a DBus connection to Tracker"));
- return EXIT_FAILURE;
- }
-
- fields_resolved = g_new0 (gchar*, g_strv_length (fields) + 1);
-
- for (i = 0, j = 0; fields && fields[i] != NULL; i++) {
- gchar *field;
-
- field = g_locale_to_utf8 (fields[i], -1, NULL, NULL, NULL);
-
- if (field) {
- fields_resolved[j++] = field;
- }
- }
-
- fields_resolved[j] = NULL;
-
- path_in_utf8 = g_filename_to_utf8 (path, -1, NULL, NULL, &error);
- if (error) {
- g_printerr ("%s:'%s', %s\n",
- _("Could not get UTF-8 path from path"),
- path,
- error->message);
- g_error_free (error);
- tracker_disconnect (client);
-
- return EXIT_FAILURE;
- }
-
- file = g_file_new_for_commandline_arg (path_in_utf8);
- abs_path = g_file_get_path (file);
-
- array = tracker_files_get_metadata_for_files_in_folder (client,
- time (NULL),
- abs_path,
- fields_resolved,
- &error);
-
- g_free (path_in_utf8);
- g_free (abs_path);
- g_object_unref (file);
-
- if (error) {
- g_printerr ("%s:'%s', %s\n",
- _("Could not get meta-data for files in directory"),
- path,
- error->message);
- g_error_free (error);
- g_strfreev (fields_resolved);
- tracker_disconnect (client);
-
- return EXIT_FAILURE;
- }
-
- if (!array) {
- g_print ("%s\n",
- _("No meta-data found for files in that directory"));
- } else {
- gint length;
-
- length = array->len;
-
- g_print (tracker_dngettext (NULL,
- _("Result: %d"),
- _("Results: %d"),
- length),
- length);
- g_print ("\n");
-
- print_header (fields_resolved);
-
- g_ptr_array_foreach (array,
- get_meta_table_data,
- fields_resolved);
- g_ptr_array_free (array, TRUE);
- }
-
- g_strfreev (fields_resolved);
- tracker_disconnect (client);
-
- return EXIT_SUCCESS;
-}
diff --git a/src/tracker-utils/tracker-search.c b/src/tracker-utils/tracker-search.c
index 284dcd7..324c598 100644
--- a/src/tracker-utils/tracker-search.c
+++ b/src/tracker-utils/tracker-search.c
@@ -192,6 +192,8 @@ main (int argc, char **argv)
search = g_strjoinv (" ", terms);
+ /* TODO: Port to SPARQL */
+#if 0
if (detailed) {
array = tracker_search_text_detailed (client,
time (NULL),
@@ -294,6 +296,7 @@ main (int argc, char **argv)
g_free (strv);
}
}
+#endif
tracker_disconnect (client);
diff --git a/src/tracker-utils/tracker-services.c b/src/tracker-utils/tracker-services.c
index 786812c..878e7fd 100644
--- a/src/tracker-utils/tracker-services.c
+++ b/src/tracker-utils/tracker-services.c
@@ -87,6 +87,8 @@ main (int argc, char **argv)
return EXIT_FAILURE;
}
+ /* TODO: Port to SPARQL */
+#if 0
if (services) {
array = tracker_metadata_get_registered_classes (client, &error);
@@ -153,6 +155,7 @@ main (int argc, char **argv)
}
}
+#endif
tracker_disconnect (client);
diff --git a/src/tracker-utils/tracker-tag.c b/src/tracker-utils/tracker-tag.c
index df74af7..0ba8df2 100644
--- a/src/tracker-utils/tracker-tag.c
+++ b/src/tracker-utils/tracker-tag.c
@@ -192,6 +192,8 @@ main (int argc, char **argv)
files_resolved[j] = NULL;
}
+ /* TODO: Port to SPARQL */
+#if 0
if (add || rm || rm_all) {
if (add) {
tags_to_add = g_new0 (gchar*, g_strv_length (add) + 1);
@@ -406,6 +408,7 @@ main (int argc, char **argv)
g_strfreev (results);
}
}
+#endif
finish:
g_strfreev (tags_to_remove);
diff --git a/src/trackerd/Makefile.am b/src/trackerd/Makefile.am
index 2bdb41a..62bb361 100644
--- a/src/trackerd/Makefile.am
+++ b/src/trackerd/Makefile.am
@@ -40,17 +40,11 @@ trackerd_SOURCES = \
tracker-daemon.h \
tracker-dbus.c \
tracker-dbus.h \
- tracker-files.c \
- tracker-files.h \
- tracker-keywords.c \
- tracker-keywords.h \
tracker-processor.c \
tracker-processor.h \
tracker-main.c \
tracker-main.h \
tracker-marshal-main.c \
- tracker-metadata.c \
- tracker-metadata.h \
tracker-monitor.c \
tracker-monitor.h \
tracker-search.c \
@@ -108,9 +102,6 @@ marshal_sources = \
dbus_sources = \
tracker-backup-glue.h \
tracker-daemon-glue.h \
- tracker-files-glue.h \
- tracker-keywords-glue.h \
- tracker-metadata-glue.h \
tracker-search-glue.h \
tracker-indexer-client.h
diff --git a/src/trackerd/tracker-daemon.c b/src/trackerd/tracker-daemon.c
index 2670a87..703a552 100644
--- a/src/trackerd/tracker-daemon.c
+++ b/src/trackerd/tracker-daemon.c
@@ -372,41 +372,6 @@ tracker_daemon_get_status (TrackerDaemon *object,
tracker_dbus_request_unblock_hooks ();
}
-void
-tracker_daemon_get_services (TrackerDaemon *object,
- gboolean main_services_only,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- GHashTable *values = NULL;
-
- /* FIXME: Note, the main_services_only variable is redundant */
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_request_new (request_id,
- "DBus request to get daemon services");
-
- iface = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
-
- result_set = tracker_data_manager_exec_proc (iface, "GetServices", 0);
- values = tracker_dbus_query_result_to_hash_table (result_set);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
-
- g_hash_table_destroy (values);
-
- tracker_dbus_request_success (request_id);
-}
-
-
static void
stats_cache_update (TrackerDaemon *object)
{
diff --git a/src/trackerd/tracker-daemon.h b/src/trackerd/tracker-daemon.h
index 66185f3..837fb1c 100644
--- a/src/trackerd/tracker-daemon.h
+++ b/src/trackerd/tracker-daemon.h
@@ -61,10 +61,6 @@ void tracker_daemon_get_version (TrackerDaemon *object,
void tracker_daemon_get_status (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
-void tracker_daemon_get_services (TrackerDaemon *object,
- gboolean main_services_only,
- DBusGMethodInvocation *context,
- GError **error);
void tracker_daemon_get_stats (TrackerDaemon *object,
DBusGMethodInvocation *context,
GError **error);
diff --git a/src/trackerd/tracker-dbus.c b/src/trackerd/tracker-dbus.c
index 43f640c..764fc03 100644
--- a/src/trackerd/tracker-dbus.c
+++ b/src/trackerd/tracker-dbus.c
@@ -33,12 +33,6 @@
#include "tracker-dbus.h"
#include "tracker-daemon.h"
#include "tracker-daemon-glue.h"
-#include "tracker-files.h"
-#include "tracker-files-glue.h"
-#include "tracker-keywords.h"
-#include "tracker-keywords-glue.h"
-#include "tracker-metadata.h"
-#include "tracker-metadata-glue.h"
#include "tracker-search.h"
#include "tracker-search-glue.h"
#include "tracker-backup.h"
@@ -290,48 +284,6 @@ tracker_dbus_register_objects (TrackerConfig *config,
TRACKER_DAEMON_PATH);
objects = g_slist_prepend (objects, object);
- /* Add org.freedesktop.Tracker.Files */
- object = tracker_files_new (processor);
- if (!object) {
- g_critical ("Could not create TrackerFiles object to register");
- return FALSE;
- }
-
- dbus_register_object (connection,
- gproxy,
- G_OBJECT (object),
- &dbus_glib_tracker_files_object_info,
- TRACKER_FILES_PATH);
- objects = g_slist_prepend (objects, object);
-
- /* Add org.freedesktop.Tracker.Keywords */
- object = tracker_keywords_new ();
- if (!object) {
- g_critical ("Could not create TrackerKeywords object to register");
- return FALSE;
- }
-
- dbus_register_object (connection,
- gproxy,
- G_OBJECT (object),
- &dbus_glib_tracker_keywords_object_info,
- TRACKER_KEYWORDS_PATH);
- objects = g_slist_prepend (objects, object);
-
- /* Add org.freedesktop.Tracker.Metadata */
- object = tracker_metadata_new ();
- if (!object) {
- g_critical ("Could not create TrackerMetadata object to register");
- return FALSE;
- }
-
- dbus_register_object (connection,
- gproxy,
- G_OBJECT (object),
- &dbus_glib_tracker_metadata_object_info,
- TRACKER_METADATA_PATH);
- objects = g_slist_prepend (objects, object);
-
/* Add org.freedesktop.Tracker.Search */
object = tracker_search_new (config, language, file_index, email_index);
if (!object) {
diff --git a/src/trackerd/tracker-files.c b/src/trackerd/tracker-files.c
deleted file mode 100644
index 943c751..0000000
--- a/src/trackerd/tracker-files.c
+++ /dev/null
@@ -1,950 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
-#include <libtracker-common/tracker-type-utils.h>
-
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-manager.h>
-
-#include <libtracker-data/tracker-data-manager.h>
-#include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-data-schema.h>
-#include <libtracker-data/tracker-data-search.h>
-
-#include "tracker-dbus.h"
-#include "tracker-files.h"
-#include "tracker-marshal.h"
-#include "tracker-indexer-client.h"
-
-#define TRACKER_FILES_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_FILES, TrackerFilesPrivate))
-
-typedef struct {
- TrackerProcessor *processor;
-} TrackerFilesPrivate;
-
-static void tracker_files_finalize (GObject *object);
-
-G_DEFINE_TYPE(TrackerFiles, tracker_files, G_TYPE_OBJECT)
-
-static void
-tracker_files_class_init (TrackerFilesClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = tracker_files_finalize;
-
- g_type_class_add_private (object_class, sizeof (TrackerFilesPrivate));
-}
-
-static void
-tracker_files_init (TrackerFiles *object)
-{
-}
-
-static void
-tracker_files_finalize (GObject *object)
-{
- TrackerFilesPrivate *priv;
-
- priv = TRACKER_FILES_GET_PRIVATE (object);
-
- g_object_unref (priv->processor);
-
- G_OBJECT_CLASS (tracker_files_parent_class)->finalize (object);
-}
-
-TrackerFiles *
-tracker_files_new (TrackerProcessor *processor)
-{
- TrackerFiles *object;
- TrackerFilesPrivate *priv;
-
- g_return_val_if_fail (TRACKER_IS_PROCESSOR (processor), NULL);
-
- object = g_object_new (TRACKER_TYPE_FILES, NULL);
-
- priv = TRACKER_FILES_GET_PRIVATE (object);
-
- priv->processor = g_object_ref (processor);
-
- return object;
-}
-
-/*
- * Functions
- */
-void
-tracker_files_exist (TrackerFiles *object,
- const gchar *uri,
- gboolean auto_create,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- guint32 file_id;
- gboolean exists;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to see if files exist, "
- "uri:'%s' auto-create:'%d'",
- uri, auto_create);
-
- /* This API is broken. The Daemon doesn't do anything in the
- * database except read from it.
- */
- if (auto_create) {
- GError *actual_error = NULL;
-
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Request to check existence of file '%s' failed, "
- "the 'auto-create' variable can not be TRUE, "
- "this feature is no longer supported.",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
-
- return;
- }
-
- file_id = tracker_data_query_file_id (TRACKER_DB_FOR_VIRTUAL_SERVICE, uri);
- exists = file_id > 0;
-
- dbus_g_method_return (context, exists);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_create (TrackerFiles *object,
- const gchar *uri,
- gboolean is_directory,
- const gchar *mime,
- gint size,
- gint mtime,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerFilesPrivate *priv;
- GFile *file;
- const gchar *module_name = "files";
- guint request_id;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (mime != NULL, context);
- tracker_dbus_async_return_if_fail (size >= 0, context);
- tracker_dbus_async_return_if_fail (mtime >= 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to create file, "
- "uri:'%s', is directory:%s, mime:'%s', "
- "size:%d, mtime:%d",
- uri,
- is_directory ? "yes" : "no",
- mime,
- size,
- mtime);
-
- priv = TRACKER_FILES_GET_PRIVATE (object);
-
- file = g_file_new_for_path (uri);
- tracker_processor_files_check (priv->processor, module_name, file, is_directory);
- g_object_unref (file);
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_delete (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerFilesPrivate *priv;
- GFile *file;
- const gchar *module_name = "files";
- guint request_id;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to delete file, "
- "uri:'%s'",
- uri);
-
- priv = TRACKER_FILES_GET_PRIVATE (object);
-
- /* Check the file exists, if not delete, this is broken, we
- * really don't know with the API if it is a file or
- * directory we are dealing with so we check both.
- */
- file = g_file_new_for_path (uri);
- tracker_processor_files_check (priv->processor, module_name, file, TRUE);
- tracker_processor_files_check (priv->processor, module_name, file, FALSE);
- g_object_unref (file);
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-static const gchar *
-get_file_id_and_db_service (const gchar *uri, gint *id)
-{
- *id = tracker_data_query_file_id (TRACKER_DB_FOR_FILE_SERVICE, uri);
- if (*id) {
- return TRACKER_DB_FOR_FILE_SERVICE;
- }
-
- *id = tracker_data_query_file_id (TRACKER_DB_FOR_EMAIL_SERVICE, uri);
- if (*id) {
- return TRACKER_DB_FOR_EMAIL_SERVICE;
- }
-
- *id = tracker_data_query_file_id (TRACKER_DB_FOR_VIRTUAL_SERVICE, uri);
- if (*id) {
- return TRACKER_DB_FOR_VIRTUAL_SERVICE;
- }
-
- return NULL;
-}
-
-void
-tracker_files_get_service_type (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface = NULL;
- TrackerDBResultSet *result_set;
- guint request_id;
- gint file_id;
- gchar *file_id_str;
- const gchar *value;
- const gchar *service_type;
- const gchar *mime = NULL;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get service type ",
- "uri:'%s'",
- uri);
-
- service_type = get_file_id_and_db_service (uri, &file_id);
-
- if (file_id < 1) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "File '%s' was not found in the database",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Get mime */
- file_id_str = tracker_guint_to_string (file_id);
-
- iface = tracker_db_manager_get_db_interface_by_service (service_type);
- mime = NULL;
- result_set = tracker_data_query_metadata_field (iface,
- file_id_str,
- "File:Mime");
-
- if (result_set) {
- tracker_db_result_set_get (result_set, 0, &mime, -1);
- g_object_unref (result_set);
- }
-
- g_free (file_id_str);
-
- if (!mime) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Metadata 'File:Mime' for '%s' doesn't exist",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Get service from mime */
- value = tracker_ontology_get_service_by_mime (mime);
-
- if (value) {
- tracker_dbus_request_comment (request_id,
- "Info for file '%s', "
- "id:%d, mime:'%s', service:'%s'",
- uri,
- file_id,
- mime,
- value);
- dbus_g_method_return (context, value);
-
- tracker_dbus_request_success (request_id);
- } else {
-
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Unable to find service to mime '%s'",
- mime);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- }
-}
-
-void
-tracker_files_get_text_contents (TrackerFiles *object,
- const gchar *uri,
- gint offset,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gint service_id;
- gchar *service_id_str;
- gchar *offset_str;
- gchar *max_length_str;
- gchar *value;
- const gchar *service_type;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (offset >= 0, context);
- tracker_dbus_async_return_if_fail (max_length >= 0, context);
- tracker_dbus_async_return_if_fail (value != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get text contents, "
- "uri:'%s', offset:%d, max length:%d",
- uri,
- offset,
- max_length);
-
- service_type = get_file_id_and_db_service (uri, &service_id);
- if (!service_type || service_id == 0) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Unable to retrieve service ID for uri '%s'",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
-
- offset_str = tracker_gint_to_string (offset);
- max_length_str = tracker_gint_to_string (max_length);
-
- iface = tracker_db_manager_get_db_interface_by_service (service_type);
- service_id_str = g_strdup_printf ("%d", service_id);
- result_set = tracker_data_manager_exec_proc (iface,
- "GetFileContents",
- offset_str,
- max_length_str,
- service_id,
- NULL);
-
- g_free (max_length_str);
- g_free (offset_str);
- g_free (service_id_str);
-
- if (result_set) {
- tracker_db_result_set_get (result_set, 0, &value, -1);
- g_object_unref (result_set);
-
- if (value == NULL) {
- value = g_strdup ("");
- }
-
- dbus_g_method_return (context, value);
- g_free (value);
-
- tracker_dbus_request_success (request_id);
-
- } else {
-
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "The contents of the uri '%s' are not stored",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- }
-}
-
-void
-tracker_files_search_text_contents (TrackerFiles *object,
- const gchar *uri,
- const gchar *text,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set = NULL;
- guint request_id;
- gchar *name = NULL;
- gchar *path = NULL;
- gchar *max_length_str;
- gchar *value = NULL;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (text != NULL, context);
- tracker_dbus_async_return_if_fail (max_length >= 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search text contents, "
- "in uri:'%s' for text:'%s' with max length:%d",
- uri,
- text,
- max_length);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- tracker_file_get_path_and_name (uri, &path, &name);
-
- max_length_str = tracker_gint_to_string (max_length);
-
- /* result_set = tracker_exec_proc (iface, */
- /* "SearchFileContents", */
- /* 4, */
- /* path, */
- /* name, */
- /* text, */
- /* max_length_str); */
-
-
- g_free (max_length_str);
- g_free (path);
- g_free (name);
-
- if (result_set) {
- tracker_db_result_set_get (result_set, 0, value, -1);
- g_object_unref (result_set);
- } else {
- value = g_strdup ("");
- }
-
- /* Fixme: when this is implemented, we should return TRUE and
- * change this function to the success variant.
- */
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "%s not implemented yet",
- __FUNCTION__);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
-}
-
-void
-tracker_files_get_by_service_type (TrackerFiles *object,
- gint live_query_id,
- const gchar *service,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service != NULL, context);
- tracker_dbus_async_return_if_fail (offset >= 0, context);
- tracker_dbus_async_return_if_fail (max_hits >= 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get files by service type, "
- "query id:%d, service:'%s', offset:%d, max hits:%d, ",
- live_query_id,
- service,
- offset,
- max_hits);
-
- if (!tracker_ontology_service_is_valid (service)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service '%s' is invalid or has not been implemented yet",
- service);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- iface = tracker_db_manager_get_db_interface_by_service (service);
-
- result_set = tracker_data_search_files_get_by_service (iface,
- service,
- offset,
- max_hits);
-
- values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_get_by_mime_type (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (mime_types != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
- tracker_dbus_async_return_if_fail (offset >= 0, context);
- tracker_dbus_async_return_if_fail (max_hits >= 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get files by mime types, "
- "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
- live_query_id,
- g_strv_length (mime_types),
- offset,
- max_hits);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- result_set = tracker_data_search_files_get_by_mime (iface,
- mime_types,
- g_strv_length (mime_types),
- offset,
- max_hits,
- FALSE);
-
- values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (mime_types != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
- tracker_dbus_async_return_if_fail (offset >= 0, context);
- tracker_dbus_async_return_if_fail (max_hits >= 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get files by mime types (VFS), "
- "query id:%d, mime types:%d, offset:%d, max hits:%d, ",
- live_query_id,
- g_strv_length (mime_types),
- offset,
- max_hits);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- /* NOTE: The only difference between this function and the
- * non-VFS version is the boolean in this function call:
- */
- result_set = tracker_data_search_files_get_by_mime (iface,
- mime_types,
- g_strv_length (mime_types),
- offset,
- max_hits,
- TRUE);
-
- values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_get_mtime (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar *path = NULL;
- gchar *name = NULL;
- gint mtime;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request for mtime, "
- "uri:'%s'",
- uri);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- tracker_file_get_path_and_name (uri, &path, &name);
-
- result_set = tracker_data_manager_exec_proc (iface,
- "GetFileMTime",
- path,
- name,
- NULL);
- g_free (path);
- g_free (name);
-
- if (!result_set) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "There is no file mtime in the database for '%s'",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- tracker_db_result_set_get (result_set, 0, &mtime, -1);
- g_object_unref (result_set);
-
- dbus_g_method_return (context, mtime);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
- gint live_query_id,
- const gchar *uri,
- gchar **fields,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBResultSet *result_set;
- guint request_id;
- GPtrArray *values;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (fields != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (fields) > 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request for metadata for files in folder, "
- "query id:%d, uri:'%s', fields:%d",
- live_query_id,
- uri,
- g_strv_length (fields));
-
- result_set = tracker_data_search_metadata_in_path (uri,
- fields,
- &actual_error);
-
- if (actual_error) {
- tracker_dbus_request_failed (request_id, &actual_error, NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- values = tracker_dbus_query_result_to_ptr_array (result_set);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
-
- tracker_dbus_results_ptr_array_free (&values);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_search_by_text_and_mime (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (text != NULL, context);
- tracker_dbus_async_return_if_fail (mime_types != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search files by text & mime types, "
- "text:'%s', mime types:%d",
- text,
- g_strv_length (mime_types));
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- result_set = tracker_data_search_text_and_mime (iface, text, mime_types);
-
- if (result_set) {
- gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count = 0;
- gint i = 0;
-
- row_count = tracker_db_result_set_get_n_rows (result_set);
- values = g_new0 (gchar *, row_count);
-
- while (valid) {
- tracker_db_result_set_get (result_set,
- 0, &prefix,
- 1, &name,
- -1);
-
- values[i++] = g_build_filename (prefix, name, NULL);
- valid = tracker_db_result_set_iter_next (result_set);
-
- g_free (prefix);
- g_free (name);
- }
-
- g_object_unref (result_set);
- } else {
- values = g_new0 (gchar *, 1);
- values[0] = NULL;
- }
-
- dbus_g_method_return (context, values);
-
- g_strfreev (values);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_search_by_text_and_location (TrackerFiles *object,
- const gchar *text,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (text != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search files by text & location, "
- "text:'%s', uri:'%s'",
- text,
- uri);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- result_set = tracker_data_search_text_and_location (iface, text, uri);
-
- if (result_set) {
- gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count;
- gint i = 0;
-
- row_count = tracker_db_result_set_get_n_rows (result_set);
- values = g_new0 (gchar *, row_count);
-
- while (valid) {
- tracker_db_result_set_get (result_set,
- 0, &prefix,
- 1, &name,
- -1);
-
- values[i++] = g_build_filename (prefix, name, NULL);
- valid = tracker_db_result_set_iter_next (result_set);
-
- g_free (prefix);
- g_free (name);
- }
-
- g_object_unref (result_set);
- } else {
- values = g_new0 (gchar *, 1);
- values[0] = NULL;
- }
-
- dbus_g_method_return (context, values);
-
- g_strfreev (values);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (text != NULL, context);
- tracker_dbus_async_return_if_fail (mime_types != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (mime_types) > 0, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search files by text & mime types & location, "
- "text:'%s', mime types:%d, uri:'%s'",
- text,
- g_strv_length (mime_types),
- uri);
-
- iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE);
-
- result_set = tracker_data_search_text_and_mime_and_location (iface, text, mime_types, uri);
-
- if (result_set) {
- gboolean valid = TRUE;
- gchar *prefix, *name;
- gint row_count;
- gint i = 0;
-
- row_count = tracker_db_result_set_get_n_rows (result_set);
- values = g_new0 (gchar *, row_count);
-
- while (valid) {
- tracker_db_result_set_get (result_set,
- 0, &prefix,
- 1, &name,
- -1);
-
- values[i++] = g_build_filename (prefix, name, NULL);
- valid = tracker_db_result_set_iter_next (result_set);
-
- g_free (prefix);
- g_free (name);
- }
-
- g_object_unref (result_set);
- } else {
- values = g_new0 (gchar *, 1);
- values[0] = NULL;
- }
-
- dbus_g_method_return (context, values);
-
- g_strfreev (values);
-
- tracker_dbus_request_success (request_id);
-}
diff --git a/src/trackerd/tracker-files.h b/src/trackerd/tracker-files.h
deleted file mode 100644
index dbafb92..0000000
--- a/src/trackerd/tracker-files.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __TRACKERD_FILES_H__
-#define __TRACKERD_FILES_H__
-
-#include <glib-object.h>
-
-#define TRACKER_FILES_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_FILES_PATH "/org/freedesktop/Tracker/Files"
-#define TRACKER_FILES_INTERFACE "org.freedesktop.Tracker.Files"
-
-G_BEGIN_DECLS
-
-#define TRACKER_TYPE_FILES (tracker_files_get_type ())
-#define TRACKER_FILES(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_FILES, TrackerFiles))
-#define TRACKER_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_FILES, TrackerFilesClass))
-#define TRACKER_IS_FILES(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_FILES))
-#define TRACKER_IS_FILES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_FILES))
-#define TRACKER_FILES_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_FILES, TrackerFilesClass))
-
-typedef struct TrackerFiles TrackerFiles;
-typedef struct TrackerFilesClass TrackerFilesClass;
-
-struct TrackerFiles {
- GObject parent;
-};
-
-struct TrackerFilesClass {
- GObjectClass parent;
-};
-
-GType tracker_files_get_type (void);
-TrackerFiles *tracker_files_new (TrackerProcessor *processor);
-void tracker_files_exist (TrackerFiles *object,
- const gchar *uri,
- gboolean auto_create,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_create (TrackerFiles *object,
- const gchar *uri,
- gboolean is_directory,
- const gchar *mime,
- gint size,
- gint mtime,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_delete (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_service_type (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_text_contents (TrackerFiles *object,
- const gchar *uri,
- gint offset,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_text_contents (TrackerFiles *object,
- const gchar *uri,
- const gchar *text,
- gint max_length,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_service_type (TrackerFiles *object,
- gint live_query_id,
- const gchar *service,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_mime_type (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_by_mime_type_vfs (TrackerFiles *object,
- gint live_query_id,
- gchar **mime_types,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_mtime (TrackerFiles *object,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_get_metadata_for_files_in_folder (TrackerFiles *object,
- gint live_query_id,
- const gchar *uri,
- gchar **fields,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_mime (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_location (TrackerFiles *object,
- const gchar *text,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_files_search_by_text_and_mime_and_location (TrackerFiles *object,
- const gchar *text,
- gchar **mime_types,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-
-
-
-G_END_DECLS
-
-#endif /* __TRACKERD_FILES_H__ */
diff --git a/src/trackerd/tracker-keywords.c b/src/trackerd/tracker-keywords.c
deleted file mode 100644
index 8009b7a..0000000
--- a/src/trackerd/tracker-keywords.c
+++ /dev/null
@@ -1,549 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-utils.h>
-
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-index.h>
-#include <libtracker-db/tracker-db-manager.h>
-
-#include <libtracker-data/tracker-data-manager.h>
-#include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-data-schema.h>
-#include <libtracker-data/tracker-data-search.h>
-
-#include "tracker-dbus.h"
-#include "tracker-keywords.h"
-#include "tracker-marshal.h"
-#include "tracker-indexer-client.h"
-
-#define TRACKER_KEYWORDS_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_KEYWORDS, TrackerKeywordsPrivate))
-
-typedef struct {
- DBusGProxy *fd_proxy;
-} TrackerKeywordsPrivate;
-
-enum {
- KEYWORD_ADDED,
- KEYWORD_REMOVED,
- LAST_SIGNAL
-};
-
-static void tracker_keywords_finalize (GObject *object);
-
-static guint signals[LAST_SIGNAL] = {0};
-
-G_DEFINE_TYPE(TrackerKeywords, tracker_keywords, G_TYPE_OBJECT)
-
-static void
-tracker_keywords_class_init (TrackerKeywordsClass *klass)
-{
- GObjectClass *object_class;
-
- object_class = G_OBJECT_CLASS (klass);
-
- object_class->finalize = tracker_keywords_finalize;
-
- signals[KEYWORD_ADDED] =
- g_signal_new ("keyword-added",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_STRING,
- G_TYPE_NONE,
- 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
- signals[KEYWORD_REMOVED] =
- g_signal_new ("keyword-removed",
- G_TYPE_FROM_CLASS (klass),
- G_SIGNAL_RUN_LAST,
- 0,
- NULL, NULL,
- tracker_marshal_VOID__STRING_STRING_STRING,
- G_TYPE_NONE,
- 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
- g_type_class_add_private (object_class, sizeof (TrackerKeywordsPrivate));
-}
-
-static void
-tracker_keywords_init (TrackerKeywords *object)
-{
-}
-
-static void
-tracker_keywords_finalize (GObject *object)
-{
- TrackerKeywordsPrivate *priv;
-
- priv = TRACKER_KEYWORDS_GET_PRIVATE (object);
-
- if (priv->fd_proxy) {
- g_object_unref (priv->fd_proxy);
- }
-
- G_OBJECT_CLASS (tracker_keywords_parent_class)->finalize (object);
-}
-
-TrackerKeywords *
-tracker_keywords_new (void)
-{
- return g_object_new (TRACKER_TYPE_KEYWORDS, NULL);
-}
-
-/*
- * Functions
- */
-void
-tracker_keywords_get_list (TrackerKeywords *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- GError *actual_error = NULL;
- GPtrArray *values;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get keywords list, "
- "service type:'%s'",
- service_type);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- iface = tracker_db_manager_get_db_interface_by_service (service_type);
- result_set = tracker_data_search_keywords_get_list (iface, service_type);
- values = tracker_dbus_query_result_to_ptr_array (result_set);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
- tracker_dbus_results_ptr_array_free (&values);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_keywords_get (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar *id;
- GError *actual_error = NULL;
- gchar **values;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get keywords, "
- "service type:'%s', uri:'%s'",
- service_type,
- uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
- service_type);
- }
-
- if (!actual_error && tracker_is_empty_string (uri)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "URI is empty");
- }
-
- if (actual_error) {
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Entity '%s' was not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- iface = tracker_db_manager_get_db_interface_by_service (service_type);
- result_set = tracker_data_query_metadata_field (iface,
- id,
- "User:Keywords");
- values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- g_free (id);
-
- dbus_g_method_return (context, values);
-
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_keywords_add (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar *id;
- GError *actual_error = NULL;
- gchar **check;
- gchar *stripped_value;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (keywords != NULL && *keywords != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to add keywords, "
- "service type:'%s', uri:'%s'",
- service_type,
- uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (uri)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "URI is empty");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Entity '%s' was not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- for (check = keywords; *check != NULL; check++) {
- stripped_value = g_strstrip (g_strdup (*check));
-
- if (tracker_is_empty_string (stripped_value)) {
- g_free (stripped_value);
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Blank spaces are not allowed as keywords");
- dbus_g_method_return_error (context, actual_error);
- g_free (id);
- g_error_free (actual_error);
- return;
- }
- g_free (stripped_value);
- }
-
- org_freedesktop_Tracker_Indexer_property_set (tracker_dbus_indexer_get_proxy (),
- service_type,
- uri,
- "User:Keywords",
- (const gchar **)keywords,
- &actual_error);
-
- if (actual_error) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- g_free (id);
- return;
- }
-
- g_free (id);
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_keywords_remove (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar *service_id;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (keywords != NULL && g_strv_length (keywords) > 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to remove keywords, "
- "service type:'%s', uri:'%s'",
- service_type,
- uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (uri)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "URI is empty");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Check the uri exists, so we dont start the indexer in vain */
- service_id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!service_id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Entity '%s' was not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- org_freedesktop_Tracker_Indexer_property_remove (tracker_dbus_indexer_get_proxy (),
- service_type,
- uri,
- "User:Keywords",
- (const gchar **)keywords,
- &actual_error);
-
- if (actual_error) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- g_free (service_id);
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_keywords_remove_all (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar **values;
- gchar *service_id;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to remove all keywords, "
- "service type:'%s', uri:'%s'",
- service_type,
- uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (uri)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "URI is empty");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Check the uri exists, so we dont start the indexer in vain */
- service_id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!service_id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Entity '%s' was not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- values = g_new0 (gchar *, 1);
- values[0] = NULL;
- org_freedesktop_Tracker_Indexer_property_remove (tracker_dbus_indexer_get_proxy (),
- service_type,
- uri,
- "User:Keywords",
- (const gchar **)values,
- &actual_error);
-
- g_strfreev (values);
- if (actual_error) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_keywords_search (TrackerKeywords *object,
- gint live_query_id,
- const gchar *service_type,
- const gchar **keywords,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBResultSet *result_set;
- guint request_id;
- gchar **values;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (keywords != NULL, context);
- tracker_dbus_async_return_if_fail (keywords[0] != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search keywords, "
- "query id:%d, service type:'%s', offset:%d, "
- "max hits:%d",
- live_query_id,
- service_type,
- offset,
- max_hits);
-
- result_set = tracker_data_search_keywords (service_type,
- keywords,
- offset,
- max_hits,
- &actual_error);
-
- if (actual_error) {
- tracker_dbus_request_failed (request_id, &actual_error, NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- dbus_g_method_return (context, values);
-
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
diff --git a/src/trackerd/tracker-keywords.h b/src/trackerd/tracker-keywords.h
deleted file mode 100644
index 9ed80d5..0000000
--- a/src/trackerd/tracker-keywords.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __TRACKERD_KEYWORDS_H__
-#define __TRACKERD_KEYWORDS_H__
-
-#include <glib-object.h>
-
-#define TRACKER_KEYWORDS_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_KEYWORDS_PATH "/org/freedesktop/Tracker/Keywords"
-#define TRACKER_KEYWORDS_INTERFACE "org.freedesktop.Tracker.Keywords"
-
-G_BEGIN_DECLS
-
-#define TRACKER_TYPE_KEYWORDS (tracker_keywords_get_type ())
-#define TRACKER_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_KEYWORDS, TrackerKeywords))
-#define TRACKER_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_KEYWORDS, TrackerKeywordsClass))
-#define TRACKER_IS_KEYWORDS(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_KEYWORDS))
-#define TRACKER_IS_KEYWORDS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_KEYWORDS))
-#define TRACKER_KEYWORDS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_KEYWORDS, TrackerKeywordsClass))
-
-typedef struct TrackerKeywords TrackerKeywords;
-typedef struct TrackerKeywordsClass TrackerKeywordsClass;
-
-struct TrackerKeywords {
- GObject parent;
-};
-
-struct TrackerKeywordsClass {
- GObjectClass parent;
-};
-
-GType tracker_keywords_get_type (void);
-TrackerKeywords *tracker_keywords_new (void);
-void tracker_keywords_get_list (TrackerKeywords *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_get (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_add (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_remove (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keywords,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_remove_all (TrackerKeywords *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_keywords_search (TrackerKeywords *object,
- gint live_query_id,
- const gchar *service_type,
- const gchar **keywords,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-
-
-G_END_DECLS
-
-#endif /* __TRACKERD_KEYWORDS_H__ */
diff --git a/src/trackerd/tracker-metadata.c b/src/trackerd/tracker-metadata.c
deleted file mode 100644
index 1ce5176..0000000
--- a/src/trackerd/tracker-metadata.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-
-#include <string.h>
-
-#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-type-utils.h>
-
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-index.h>
-#include <libtracker-db/tracker-db-manager.h>
-
-#include <libtracker-data/tracker-data-manager.h>
-#include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-data-schema.h>
-#include <libtracker-data/tracker-data-search.h>
-
-#include "tracker-indexer-client.h"
-#include "tracker-dbus.h"
-#include "tracker-metadata.h"
-#include "tracker-marshal.h"
-
-G_DEFINE_TYPE(TrackerMetadata, tracker_metadata, G_TYPE_OBJECT)
-
-static void
-tracker_metadata_class_init (TrackerMetadataClass *klass)
-{
-}
-
-static void
-tracker_metadata_init (TrackerMetadata *object)
-{
-}
-
-TrackerMetadata *
-tracker_metadata_new (void)
-{
- return g_object_new (TRACKER_TYPE_METADATA, NULL);
-}
-
-/*
- * Functions
- */
-
-static gchar **
-tracker_metadata_get_internal (TrackerMetadata *object,
- guint request_id,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- const gchar *service_result;
- guint32 service_id;
- gchar *service_id_str;
- guint i;
- gchar **values;
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- error,
- "Service '%s' is invalid or has not been implemented yet",
- service_type);
- return NULL;
- }
-
- service_id = tracker_data_query_file_id (service_type, uri);
-
- if (service_id <= 0) {
- tracker_dbus_request_failed (request_id,
- error,
- "Service URI '%s' not found",
- uri);
- return NULL;
- }
-
- /* Checking keys */
- for (i = 0; i < g_strv_length (keys); i++) {
- if (tracker_ontology_get_field_by_name (keys[i]) == NULL) {
- tracker_dbus_request_failed (request_id,
- error,
- "Metadata field '%s' not registered in the system",
- keys[i]);
- return NULL;
- }
- }
-
- /* Get database interface */
- iface = tracker_db_manager_get_db_interface_by_service (service_type);
-
- /* Check we have a file in the database before looking up the metadata. */
- service_result = tracker_data_query_service_type_by_id (iface, service_id);
- if (!service_result) {
- tracker_dbus_request_failed (request_id,
- error,
- "Service type can not be found for entity '%s'",
- uri);
- return NULL;
- }
-
- service_id_str = tracker_guint_to_string (service_id);
- result_set = tracker_data_query_metadata_fields (iface, service_result, service_id_str, keys);
- g_free (service_id_str);
-
- if (result_set) {
- values = tracker_dbus_query_result_columns_to_strv (result_set, -1, -1, TRUE);
- g_object_unref (result_set);
- } else {
- values = NULL;
- }
-
- if (!values) {
- tracker_dbus_request_failed (request_id,
- error,
- "No metadata information was available");
- return NULL;
- }
-
- return values;
-}
-
-void
-tracker_metadata_get (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar **values;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
- tracker_dbus_async_return_if_fail (keys != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get metadata values, "
- "service type:'%s'",
- service_type);
-
- values = tracker_metadata_get_internal (object,
- request_id,
- service_type,
- uri,
- keys,
- &actual_error);
-
- if (!values) {
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- dbus_g_method_return (context, values);
- g_strfreev (values);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_metadata_get_multiple (TrackerMetadata *object,
- const gchar *service_type,
- const gchar **uris,
- gchar **keys,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- guint count;
- gint i;
- GPtrArray *values;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uris != NULL, context);
- tracker_dbus_async_return_if_fail (keys != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get multiple metadata values, "
- "service type:'%s'",
- service_type);
-
- count = g_strv_length ((GStrv) uris);
- values = g_ptr_array_sized_new (count);
-
- for (i = 0; i < count && !actual_error; i++) {
- GStrv strv;
-
- strv = tracker_metadata_get_internal (object,
- request_id,
- service_type,
- uris[i],
- keys,
- &actual_error);
-
- /* Don't allow errors, but allow NULLs */
- g_ptr_array_add (values, strv);
- }
-
- if (G_UNLIKELY (actual_error)) {
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- } else {
- dbus_g_method_return (context, values);
- tracker_dbus_request_success (request_id);
- }
-
- g_ptr_array_foreach (values, (GFunc) g_strfreev, NULL);
- g_ptr_array_free (values, TRUE);
-}
-
-void
-tracker_metadata_get_all (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar *service_id;
- GPtrArray * values;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (uri != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get all metadata values, "
- "service type:'%s' uri:'%s'",
- service_type, uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- service_id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!service_id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service URI '%s' not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- values = tracker_data_query_all_metadata (service_type, service_id);
-
- dbus_g_method_return (context, values);
- g_ptr_array_foreach (values, (GFunc)g_strfreev, NULL);
- g_ptr_array_free (values, TRUE);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_metadata_set (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- gchar **values,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar *service_id;
- guint i;
- GError *actual_error = NULL;
- TrackerField *field_def;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
- tracker_dbus_async_return_if_fail (keys != NULL, context);
- tracker_dbus_async_return_if_fail (values != NULL, context);
- tracker_dbus_async_return_if_fail (g_strv_length (keys) > 0, context);
- tracker_dbus_async_return_if_fail (g_strv_length (values) > 0, context);
- tracker_dbus_async_return_if_fail (g_strv_length (keys) == g_strv_length (values), context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to set metadata keys, "
- "service type:'%s' uri:'%s'",
- service_type, uri);
-
- if (!tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Check the uri exists, so we dont start the indexer in vain */
- service_id = tracker_data_query_file_id_as_string (service_type, uri);
- if (!service_id) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service URI '%s' not found",
- uri);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- /* Checking keys */
- for (i = 0; i < g_strv_length (keys); i++) {
- gchar **tmp_values;
- gint len;
-
- field_def = tracker_ontology_get_field_by_name (keys[i]);
-
- if (field_def == NULL) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Metadata field '%s' not registered in the system",
- keys[i]);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- tmp_values = tracker_string_to_string_list (values[i]);
- len = g_strv_length (tmp_values);
- g_strfreev (tmp_values);
-
- if (!tracker_field_get_multiple_values (field_def) && len > 1) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Field type: '%s' doesnt support multiple values (trying to set %d)",
- tracker_field_get_name (field_def),
- len);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
- }
-
- /* Real insertion */
- for (i = 0; i < g_strv_length (keys); i++) {
- gchar **value;
-
- value = tracker_string_to_string_list (values[i]);
- org_freedesktop_Tracker_Indexer_property_set (tracker_dbus_indexer_get_proxy (),
- service_type,
- uri,
- keys[i],
- (const gchar **)value,
- &actual_error);
- g_strfreev (value);
- if (actual_error) {
- tracker_dbus_request_failed (request_id, &actual_error, NULL);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
- }
-
- g_free (service_id);
-
- /* FIXME: Check return value? */
-
- dbus_g_method_return (context);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_metadata_get_type_details (TrackerMetadata *object,
- const gchar *metadata,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- TrackerField *def = NULL;
- TrackerFieldType field_type;
- gchar *type;
- gboolean is_embedded;
- gboolean is_writable;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (metadata != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get metadata details, "
- "metadata type:'%s'",
- metadata);
-
- def = tracker_ontology_get_field_by_name (metadata);
- if (!def) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Metadata name '%s' is invalid or unrecognized",
- metadata);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- field_type = tracker_field_get_data_type (def);
-
- type = g_strdup (tracker_field_type_to_string (field_type));
- is_embedded = tracker_field_get_embedded (def);
- is_writable = !tracker_field_get_embedded (def);
-
- dbus_g_method_return (context, type, is_embedded, is_writable);
- g_free (type);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_metadata_get_registered_types (TrackerMetadata *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar **values = NULL;
- const gchar *requested = NULL;
- GSList *registered = NULL;
- GError *actual_error = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service_type != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get registered metadata types, "
- "service_type:'%s'",
- service_type);
-
- if (strcmp (service_type, "*") != 0 &&
- !tracker_ontology_service_is_valid (service_type)) {
- tracker_dbus_request_failed (request_id,
- &actual_error,
- "Service_Type '%s' is invalid or has not been implemented yet",
- service_type);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- requested = (strcmp (service_type, "*") == 0 ? NULL : service_type);
-
- registered = tracker_ontology_get_field_names_registered (requested);
-
- values = tracker_gslist_to_string_list (registered);
-
- g_slist_foreach (registered, (GFunc) g_free, NULL);
- g_slist_free (registered);
-
- dbus_g_method_return (context, values);
-
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_metadata_get_registered_classes (TrackerMetadata *object,
- DBusGMethodInvocation *context,
- GError **error)
-{
- guint request_id;
- gchar **values = NULL;
- GSList *registered = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_request_new (request_id,
- "DBus request to get registered classes");
-
- registered = tracker_ontology_get_service_names_registered ();
-
- values = tracker_gslist_to_string_list (registered);
-
- g_slist_foreach (registered, (GFunc) g_free, NULL);
- g_slist_free (registered);
-
- dbus_g_method_return (context, values);
-
- if (values) {
- g_strfreev (values);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-
diff --git a/src/trackerd/tracker-metadata.h b/src/trackerd/tracker-metadata.h
deleted file mode 100644
index 23132c2..0000000
--- a/src/trackerd/tracker-metadata.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
- * Copyright (C) 2008, Nokia
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __TRACKERD_METADATA_H__
-#define __TRACKERD_METADATA_H__
-
-#include <glib-object.h>
-
-#include <libtracker-db/tracker-db-index.h>
-
-#define TRACKER_METADATA_SERVICE "org.freedesktop.Tracker"
-#define TRACKER_METADATA_PATH "/org/freedesktop/Tracker/Metadata"
-#define TRACKER_METADATA_INTERFACE "org.freedesktop.Tracker.Metadata"
-
-G_BEGIN_DECLS
-
-#define TRACKER_TYPE_METADATA (tracker_metadata_get_type ())
-#define TRACKER_METADATA(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), TRACKER_TYPE_METADATA, TrackerMetadata))
-#define TRACKER_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TRACKER_TYPE_METADATA, TrackerMetadataClass))
-#define TRACKER_IS_METADATA(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), TRACKER_TYPE_METADATA))
-#define TRACKER_IS_METADATA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TRACKER_TYPE_METADATA))
-#define TRACKER_METADATA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TRACKER_TYPE_METADATA, TrackerMetadataClass))
-
-typedef struct TrackerMetadata TrackerMetadata;
-typedef struct TrackerMetadataClass TrackerMetadataClass;
-
-struct TrackerMetadata {
- GObject parent;
-};
-
-struct TrackerMetadataClass {
- GObjectClass parent;
-};
-
-GType tracker_metadata_get_type (void);
-TrackerMetadata *tracker_metadata_new (void);
-void tracker_metadata_get (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_all (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_multiple (TrackerMetadata *object,
- const gchar *service_type,
- const gchar **uris,
- gchar **keys,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_set (TrackerMetadata *object,
- const gchar *service_type,
- const gchar *uri,
- gchar **keys,
- gchar **metadata,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_type_details (TrackerMetadata *object,
- const gchar *metadata,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_registered_types (TrackerMetadata *object,
- const gchar *service_type,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_metadata_get_registered_classes (TrackerMetadata *object,
- DBusGMethodInvocation *context,
- GError **error);
-
-G_END_DECLS
-
-#endif /* __TRACKERD_METADATA_H__ */
diff --git a/src/trackerd/tracker-search.c b/src/trackerd/tracker-search.c
index 67f0c7b..8ff02d3 100644
--- a/src/trackerd/tracker-search.c
+++ b/src/trackerd/tracker-search.c
@@ -121,16 +121,6 @@ tracker_search_new (TrackerConfig *config,
/*
* Functions
*/
-static gint
-search_sanity_check_max_hits (gint max_hits)
-{
- if (max_hits < 1) {
- return DEFAULT_SEARCH_MAX_HITS;
- }
-
- return max_hits;
-}
-
static const gchar *
search_utf8_p_from_offset_skipping_decomp (const gchar *str,
gint offset)
@@ -410,330 +400,6 @@ search_get_snippet (const gchar *text,
}
void
-tracker_search_get_hit_count (TrackerSearch *object,
- const gchar *service,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerSearchPrivate *priv;
- TrackerQueryTree *tree;
- GError *actual_error = NULL;
- GArray *array;
- guint request_id;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service != NULL, context);
- tracker_dbus_async_return_if_fail (search_text != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get hit count, "
- "service:'%s', search text:'%s'",
- service,
- search_text);
-
- if (!tracker_ontology_service_is_valid (service)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "Service '%s' is invalid or has not been implemented yet",
- service);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (search_text)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "No search term was specified");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- priv = TRACKER_SEARCH_GET_PRIVATE (object);
-
- array = tracker_data_schema_create_service_array (service, FALSE);
- tree = tracker_query_tree_new (search_text,
- priv->config,
- priv->language,
- array);
-
- dbus_g_method_return (context, tracker_query_tree_get_hit_count (tree));
-
- g_object_unref (tree);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_search_get_hit_count_all (TrackerSearch *object,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerSearchPrivate *priv;
- TrackerDBResultSet *result_set = NULL;
- TrackerQueryTree *tree;
- GError *actual_error = NULL;
- GArray *hit_counts;
- guint request_id;
- guint i;
- GArray *array;
- GPtrArray *values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (search_text != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to get search hit count for all, "
- "search text:'%s'",
- search_text);
-
- if (tracker_is_empty_string (search_text)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "No search term was specified");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- priv = TRACKER_SEARCH_GET_PRIVATE (object);
-
- array = tracker_data_schema_create_service_array (NULL, FALSE);
- tree = tracker_query_tree_new (search_text,
- priv->config,
- priv->language,
- array);
-
- hit_counts = tracker_query_tree_get_hit_counts (tree);
-
- for (i = 0; i < hit_counts->len; i++) {
- TrackerHitCount count;
- GValue value = { 0, };
-
- if (G_UNLIKELY (!result_set)) {
- result_set = _tracker_db_result_set_new (2);
- }
-
- count = g_array_index (hit_counts, TrackerHitCount, i);
- _tracker_db_result_set_append (result_set);
-
- g_value_init (&value, G_TYPE_STRING);
- g_value_set_string (&value,
- tracker_ontology_get_service_by_id (count.service_type_id));
- _tracker_db_result_set_set_value (result_set, 0, &value);
- g_value_unset (&value);
-
- g_value_init (&value, G_TYPE_INT);
- g_value_set_int (&value, count.count);
- _tracker_db_result_set_set_value (result_set, 1, &value);
- g_value_unset (&value);
- }
-
- values = tracker_dbus_query_result_to_ptr_array (result_set);
-
- dbus_g_method_return (context, values);
-
- tracker_dbus_results_ptr_array_free (&values);
-
- if (result_set) {
- tracker_db_result_set_rewind (result_set);
- g_object_unref (result_set);
- }
-
- g_array_free (hit_counts, TRUE);
- g_object_unref (tree);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_search_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- GError *actual_error = NULL;
- guint request_id;
- gchar **strv = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service != NULL, context);
- tracker_dbus_async_return_if_fail (search_text != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search text, "
- "query id:%d, service:'%s', search text:'%s', "
- "offset:%d, max hits:%d",
- live_query_id,
- service,
- search_text,
- offset,
- max_hits);
-
- if (!tracker_ontology_service_is_valid (service)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "Service '%s' is invalid or has not been implemented yet",
- service);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (search_text)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "No search term was specified");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- iface = tracker_db_manager_get_db_interface_by_service (service);
-
- result_set = tracker_data_search_text (iface,
- service,
- search_text,
- offset,
- search_sanity_check_max_hits (max_hits),
- FALSE,
- FALSE);
-
- if (result_set) {
- gchar *prefix, *name;
- gboolean valid = TRUE;
- gint row_count;
- gint i;
-
- row_count = tracker_db_result_set_get_n_rows (result_set) + 1;
- strv = g_new (gchar*, row_count);
- i = 0;
-
- while (valid) {
- tracker_db_result_set_get (result_set,
- 0, &prefix,
- 1, &name,
- -1);
-
- strv[i++] = g_build_filename (prefix, name, NULL);
- valid = tracker_db_result_set_iter_next (result_set);
-
- g_free (prefix);
- g_free (name);
- }
-
- strv[i] = NULL;
-
- g_object_unref (result_set);
- }
-
- if (!strv) {
- strv = g_new (gchar*, 1);
- strv[0] = NULL;
- tracker_dbus_request_comment (request_id,
- "Search found no results");
- }
-
- dbus_g_method_return (context, strv);
-
- g_strfreev (strv);
-
- tracker_dbus_request_success (request_id);
-}
-
-void
-tracker_search_text_detailed (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBInterface *iface;
- TrackerDBResultSet *result_set;
- GError *actual_error = NULL;
- guint request_id;
- GPtrArray *values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (service != NULL, context);
- tracker_dbus_async_return_if_fail (search_text != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search text detailed, "
- "query id:%d, service:'%s', search text:'%s', "
- "offset:%d, max hits:%d",
- live_query_id,
- service,
- search_text,
- offset,
- max_hits);
-
- if (!tracker_ontology_service_is_valid (service)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "Service '%s' is invalid or has not been implemented yet",
- service);
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- if (tracker_is_empty_string (search_text)) {
- g_set_error (&actual_error,
- TRACKER_DBUS_ERROR,
- 0,
- "No search term was specified");
- dbus_g_method_return_error (context, actual_error);
- g_error_free (actual_error);
- return;
- }
-
- iface = tracker_db_manager_get_db_interface_by_service (service);
-
- result_set = tracker_data_search_text (iface,
- service,
- search_text,
- offset,
- search_sanity_check_max_hits (max_hits),
- FALSE,
- TRUE);
-
- values = tracker_dbus_query_result_to_ptr_array (result_set);
-
- dbus_g_method_return (context, values);
-
- tracker_dbus_results_ptr_array_free (&values);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
tracker_search_get_snippet (TrackerSearch *object,
const gchar *service,
const gchar *id,
@@ -837,60 +503,6 @@ tracker_search_get_snippet (TrackerSearch *object,
}
void
-tracker_search_files_by_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- gboolean group_results,
- DBusGMethodInvocation *context,
- GError **error)
-{
- TrackerDBResultSet *result_set;
- guint request_id;
- GHashTable *values = NULL;
-
- request_id = tracker_dbus_get_next_request_id ();
-
- tracker_dbus_async_return_if_fail (search_text != NULL, context);
-
- tracker_dbus_request_new (request_id,
- "DBus request to search files by text, "
- "query id:%d, search text:'%s', offset:%d"
- "max hits:%d, group results:'%s'",
- live_query_id,
- search_text,
- offset,
- max_hits,
- group_results ? "yes" : "no");
-
- /* FIXME: This function no longer exists, it was returning
- * NULL in every case, this DBus function needs rewriting or
- * to be removed.
- */
- result_set = NULL;
-
- /* iface = tracker_db_manager_get_db_interface_by_service (TRACKER_DB_FOR_FILE_SERVICE); */
- /* result_set = tracker_db_search_files_by_text (iface, */
- /* search_text, */
- /* offset, */
- /* search_sanity_check_max_hits (max_hits), */
- /* group_results); */
-
- values = tracker_dbus_query_result_to_hash_table (result_set);
-
- dbus_g_method_return (context, values);
-
- g_hash_table_destroy (values);
-
- if (result_set) {
- g_object_unref (result_set);
- }
-
- tracker_dbus_request_success (request_id);
-}
-
-void
tracker_search_suggest (TrackerSearch *object,
const gchar *search_text,
gint max_dist,
diff --git a/src/trackerd/tracker-search.h b/src/trackerd/tracker-search.h
index 890a1ed..10a6f21 100644
--- a/src/trackerd/tracker-search.h
+++ b/src/trackerd/tracker-search.h
@@ -57,45 +57,12 @@ TrackerSearch *tracker_search_new (TrackerConfig *config,
TrackerLanguage *language,
TrackerDBIndex *file_index,
TrackerDBIndex *email_index);
-void tracker_search_get_hit_count (TrackerSearch *object,
- const gchar *service,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_get_hit_count_all (TrackerSearch *object,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text_detailed (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
void tracker_search_get_snippet (TrackerSearch *object,
const gchar *service,
const gchar *id,
const gchar *search_text,
DBusGMethodInvocation *context,
GError **error);
-void tracker_search_files_by_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- gboolean group_results,
- DBusGMethodInvocation *context,
- GError **error);
void tracker_search_suggest (TrackerSearch *object,
const gchar *search_text,
gint max_dist,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
