tracker r2227 - in branches/indexer-split: . src/libtracker-common src/libtracker-db src/tracker-extract src/tracker-indexer src/tracker-indexer/modules src/trackerd tests/libtracker-common tests/libtracker-db tests/tracker-fts utils/qdbm
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r2227 - in branches/indexer-split: . src/libtracker-common src/libtracker-db src/tracker-extract src/tracker-indexer src/tracker-indexer/modules src/trackerd tests/libtracker-common tests/libtracker-db tests/tracker-fts utils/qdbm
- Date: Mon, 15 Sep 2008 10:43:31 +0000 (UTC)
Author: mr
Date: Mon Sep 15 10:43:31 2008
New Revision: 2227
URL: http://svn.gnome.org/viewvc/tracker?rev=2227&view=rev
Log:
* src/libtracker-common/tracker-ontology.[ch]:
* src/libtracker-db/tracker-db-index-manager.c:
* src/libtracker-db/tracker-db-manager.c:
* src/tracker-indexer/modules/files.c:
* src/tracker-indexer/tracker-indexer-db.c:
* src/tracker-indexer/tracker-indexer.c:
* src/tracker-indexer/tracker-metadata-utils.c:
* src/trackerd/tracker-db.c:
* src/trackerd/tracker-files.c:
* src/trackerd/tracker-keywords.c:
* src/trackerd/tracker-metadata.c:
* src/trackerd/tracker-query-tree.c:
* src/trackerd/tracker-rdf-query.c:
* src/trackerd/tracker-search.c:
* tests/libtracker-common/tracker-ontology-test.c:
* tests/libtracker-db/Makefile.am: Renamed a lot of the
tracker-ontology API to make it clearer and more consistent.
* src/tracker-extract/tracker-extract.c:
* tests/tracker-fts/tracker-fts-test.c: Fixed compiler warnings.
* utils/qdbm/Makefile.am: Fixed linker errors.
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/libtracker-common/tracker-ontology.c
branches/indexer-split/src/libtracker-common/tracker-ontology.h
branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
branches/indexer-split/src/libtracker-db/tracker-db-manager.c
branches/indexer-split/src/tracker-extract/tracker-extract.c
branches/indexer-split/src/tracker-indexer/modules/files.c
branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
branches/indexer-split/src/tracker-indexer/tracker-indexer.c
branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
branches/indexer-split/src/trackerd/tracker-db.c
branches/indexer-split/src/trackerd/tracker-files.c
branches/indexer-split/src/trackerd/tracker-keywords.c
branches/indexer-split/src/trackerd/tracker-metadata.c
branches/indexer-split/src/trackerd/tracker-query-tree.c
branches/indexer-split/src/trackerd/tracker-rdf-query.c
branches/indexer-split/src/trackerd/tracker-search.c
branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c
branches/indexer-split/tests/libtracker-db/Makefile.am
branches/indexer-split/tests/tracker-fts/tracker-fts-test.c
branches/indexer-split/utils/qdbm/Makefile.am
Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.c
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.c (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.c Mon Sep 15 10:43:31 2008
@@ -184,7 +184,7 @@
}
void
-tracker_ontology_add_service_type (TrackerService *service,
+tracker_ontology_service_add (TrackerService *service,
GSList *mimes,
GSList *mime_prefixes)
{
@@ -222,13 +222,13 @@
}
TrackerService *
-tracker_ontology_get_service_type_by_name (const gchar *service_str)
+tracker_ontology_service_get_by_name (const gchar *service_str)
{
return ontology_hash_lookup_by_str (service_table, service_str);
}
gchar *
-tracker_ontology_get_service_type_by_id (gint id)
+tracker_ontology_service_get_by_id (gint id)
{
TrackerService *service;
@@ -242,7 +242,7 @@
}
gchar *
-tracker_ontology_get_service_type_for_mime (const gchar *mime)
+tracker_ontology_service_get_by_mime (const gchar *mime)
{
gpointer id;
ServiceMimePrefixes *item;
@@ -251,7 +251,7 @@
/* Try a complete mime */
id = g_hash_table_lookup (mime_service, mime);
if (id) {
- return tracker_ontology_get_service_type_by_id (GPOINTER_TO_INT (id));
+ return tracker_ontology_service_get_by_id (GPOINTER_TO_INT (id));
}
/* Try in prefixes */
@@ -260,7 +260,7 @@
prefix_service = prefix_service->next) {
item = prefix_service->data;
if (g_str_has_prefix (mime, item->prefix)) {
- return tracker_ontology_get_service_type_by_id (item->service);
+ return tracker_ontology_service_get_by_id (item->service);
}
}
@@ -269,7 +269,7 @@
}
gint
-tracker_ontology_get_id_for_service_type (const char *service_str)
+tracker_ontology_service_get_id_by_name (const char *service_str)
{
TrackerService *service;
@@ -283,7 +283,7 @@
}
gchar *
-tracker_ontology_get_parent_service (const gchar *service_str)
+tracker_ontology_service_get_parent (const gchar *service_str)
{
TrackerService *service;
const gchar *parent = NULL;
@@ -298,7 +298,7 @@
}
gchar *
-tracker_ontology_get_parent_service_by_id (gint id)
+tracker_ontology_service_get_parent_by_id (gint id)
{
TrackerService *service;
@@ -312,7 +312,7 @@
}
gint
-tracker_ontology_get_parent_id_for_service_id (gint id)
+tracker_ontology_service_get_parent_id_by_id (gint id)
{
TrackerService *service;
const gchar *parent = NULL;
@@ -337,14 +337,14 @@
}
TrackerDBType
-tracker_ontology_get_db_by_service_type (const gchar *service)
+tracker_ontology_service_get_db_by_name (const gchar *service_str)
{
TrackerDBType type;
gchar *str;
- g_return_val_if_fail (service != NULL, TRACKER_DB_TYPE_FILES);
+ g_return_val_if_fail (service_str != NULL, TRACKER_DB_TYPE_FILES);
- str = g_utf8_strdown (service, -1);
+ str = g_utf8_strdown (service_str, -1);
if (g_str_has_suffix (str, "emails") ||
g_str_has_suffix (str, "attachments")) {
@@ -363,7 +363,13 @@
}
gboolean
-tracker_ontology_service_type_has_embedded (const gchar *service_str)
+tracker_ontology_service_is_valid (const gchar *service_str)
+{
+ return tracker_ontology_service_get_id_by_name (service_str) != -1;
+}
+
+gboolean
+tracker_ontology_service_has_embedded (const gchar *service_str)
{
TrackerService *service;
@@ -377,13 +383,7 @@
}
gboolean
-tracker_ontology_is_valid_service_type (const gchar *service_str)
-{
- return tracker_ontology_get_id_for_service_type (service_str) != -1;
-}
-
-gboolean
-tracker_ontology_service_type_has_metadata (const gchar *service_str)
+tracker_ontology_service_has_metadata (const gchar *service_str)
{
TrackerService *service;
@@ -397,7 +397,7 @@
}
gboolean
-tracker_ontology_service_type_has_thumbnails (const gchar *service_str)
+tracker_ontology_service_has_thumbnails (const gchar *service_str)
{
TrackerService *service;
@@ -411,7 +411,7 @@
}
gboolean
-tracker_ontology_service_type_has_text (const char *service_str)
+tracker_ontology_service_has_text (const char *service_str)
{
TrackerService *service;
@@ -425,8 +425,8 @@
}
gint
-tracker_ontology_metadata_key_in_service (const gchar *service_str,
- const gchar *meta_name)
+tracker_ontology_service_get_key_metadata (const gchar *service_str,
+ const gchar *meta_name)
{
TrackerService *service;
gint i;
@@ -508,10 +508,9 @@
const gchar *prefix;
const gchar *parent_name = NULL;
const gchar *parent_prefix = NULL;
-
if (service_type) {
- service = tracker_ontology_get_service_type_by_name (service_type);
+ service = tracker_ontology_service_get_by_name (service_type);
if (!service) {
return NULL;
}
@@ -524,10 +523,10 @@
}
/* Prefix for properties of the parent */
- parent_name = tracker_ontology_get_parent_service (service_type);
+ parent_name = tracker_ontology_service_get_parent (service_type);
if (parent_name && (g_strcmp0 (parent_name, " ") != 0)) {
- parent = tracker_ontology_get_service_type_by_name (parent_name);
+ parent = tracker_ontology_service_get_by_name (parent_name);
if (parent) {
@@ -665,8 +664,8 @@
gint key_field;
meta_name = tracker_field_get_name (field);
- key_field = tracker_ontology_metadata_key_in_service (service_type,
- meta_name);
+ key_field = tracker_ontology_service_get_key_metadata (service_type,
+ meta_name);
if (key_field > 0) {
return g_strdup_printf ("KeyMetadata%d", key_field);
Modified: branches/indexer-split/src/libtracker-common/tracker-ontology.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-ontology.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-ontology.h Mon Sep 15 10:43:31 2008
@@ -29,49 +29,55 @@
G_BEGIN_DECLS
-void tracker_ontology_init (void);
-void tracker_ontology_shutdown (void);
-void tracker_ontology_add_service_type (TrackerService *service,
- GSList *mimes,
- GSList *mime_prefixes);
-TrackerService * tracker_ontology_get_service_type_by_name (const gchar *service_str);
-gchar * tracker_ontology_get_service_type_by_id (gint id);
-gchar * tracker_ontology_get_service_type_for_mime (const gchar *mime);
-gint tracker_ontology_get_id_for_service_type (const gchar *service_str);
-gchar * tracker_ontology_get_parent_service (const gchar *service_str);
-gchar * tracker_ontology_get_parent_service_by_id (gint id);
-gint tracker_ontology_get_parent_id_for_service_id (gint id);
-TrackerDBType tracker_ontology_get_db_by_service_type (const gchar *service);
-gboolean tracker_ontology_service_type_has_embedded (const gchar *service_str);
-gboolean tracker_ontology_is_valid_service_type (const gchar *service_str);
-gboolean tracker_ontology_service_type_has_metadata (const gchar *service_str);
-gboolean tracker_ontology_service_type_has_thumbnails (const gchar *service_str);
-gboolean tracker_ontology_service_type_has_text (const gchar *service_str);
-gint tracker_ontology_metadata_key_in_service (const gchar *service_str,
- const gchar *meta_name);
-gboolean tracker_ontology_show_service_directories (const gchar *service_str);
-gboolean tracker_ontology_show_service_files (const gchar *service_str);
-GSList * tracker_ontology_registered_service_types (void);
-GSList * tracker_ontology_registered_field_types (const gchar *service_type);
+void tracker_ontology_init (void);
+void tracker_ontology_shutdown (void);
+
+/* Service mechanics */
+void tracker_ontology_service_add (TrackerService *service,
+ GSList *mimes,
+ GSList *mime_prefixes);
+TrackerService *tracker_ontology_service_get_by_name (const gchar *service_str);
+gchar * tracker_ontology_service_get_by_id (gint id);
+gchar * tracker_ontology_service_get_by_mime (const gchar *mime);
+
+gint tracker_ontology_service_get_id_by_name (const gchar *service_str);
+TrackerDBType tracker_ontology_service_get_db_by_name (const gchar *service_str);
+
+gchar * tracker_ontology_service_get_parent (const gchar *service_str);
+gchar * tracker_ontology_service_get_parent_by_id (gint id);
+gint tracker_ontology_service_get_parent_id_by_id (gint id);
+
+/* Service data */
+gboolean tracker_ontology_service_is_valid (const gchar *service_str);
+gboolean tracker_ontology_service_has_embedded (const gchar *service_str);
+gboolean tracker_ontology_service_has_metadata (const gchar *service_str);
+gboolean tracker_ontology_service_has_thumbnails (const gchar *service_str);
+gboolean tracker_ontology_service_has_text (const gchar *service_str);
+gint tracker_ontology_service_get_key_metadata (const gchar *service_str,
+ const gchar *meta_name);
+gboolean tracker_ontology_show_service_directories (const gchar *service_str);
+gboolean tracker_ontology_show_service_files (const gchar *service_str);
+GSList * tracker_ontology_registered_service_types (void);
+GSList * tracker_ontology_registered_field_types (const gchar *service_type);
/* Service directories */
-GSList * tracker_ontology_get_dirs_for_service_type (const gchar *service);
-void tracker_ontology_add_dir_to_service_type (const gchar *service,
- const gchar *path);
-void tracker_ontology_remove_dir_to_service_type (const gchar *service,
- const gchar *path);
-gchar * tracker_ontology_get_service_type_for_dir (const gchar *path);
+GSList * tracker_ontology_get_dirs_for_service_type (const gchar *service_str);
+void tracker_ontology_add_dir_to_service_type (const gchar *service_str,
+ const gchar *path);
+void tracker_ontology_remove_dir_to_service_type (const gchar *service_str,
+ const gchar *path);
+gchar * tracker_ontology_get_service_type_for_dir (const gchar *path);
/* Field handling */
-void tracker_ontology_add_field (TrackerField *field);
-gchar * tracker_ontology_get_field_column_in_services (TrackerField *field,
- const gchar *service_type);
-gchar * tracker_ontology_get_display_field (TrackerField *field);
-gboolean tracker_ontology_field_is_child_of (const gchar *child,
- const gchar *parent);
-TrackerField * tracker_ontology_get_field_def (const gchar *name);
-const gchar * tracker_ontology_get_field_id (const gchar *name);
-TrackerField * tracker_ontology_get_field_def_by_id (gint id);
+void tracker_ontology_add_field (TrackerField *field);
+gchar * tracker_ontology_get_field_column_in_services (TrackerField *field,
+ const gchar *service_str);
+gchar * tracker_ontology_get_display_field (TrackerField *field);
+gboolean tracker_ontology_field_is_child_of (const gchar *child,
+ const gchar *parent);
+TrackerField * tracker_ontology_get_field_def (const gchar *name);
+const gchar * tracker_ontology_get_field_id (const gchar *name);
+TrackerField * tracker_ontology_get_field_def_by_id (gint id);
G_END_DECLS
Modified: branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-index-manager.c Mon Sep 15 10:43:31 2008
@@ -281,7 +281,7 @@
g_return_val_if_fail (initialized == TRUE, NULL);
g_return_val_if_fail (service != NULL, NULL);
- type = tracker_ontology_get_db_by_service_type (service);
+ type = tracker_ontology_service_get_db_by_name (service);
switch (type) {
case TRACKER_DB_TYPE_FILES:
@@ -308,12 +308,12 @@
g_return_val_if_fail (initialized == TRUE, NULL);
- service = tracker_ontology_get_service_type_by_id (id);
+ service = tracker_ontology_service_get_by_id (id);
if (!service) {
return NULL;
}
- type = tracker_ontology_get_db_by_service_type (service);
+ type = tracker_ontology_service_get_db_by_name (service);
g_free (service);
switch (type) {
Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c Mon Sep 15 10:43:31 2008
@@ -346,7 +346,7 @@
for (i = 0; groups[i]; i++) {
g_message ("Trying to obtain service:'%s' in cache", groups[i]);
- service = tracker_ontology_get_service_type_by_name (groups[i]);
+ service = tracker_ontology_service_get_by_name (groups[i]);
if (!service) {
tracker_db_interface_execute_procedure (iface,
@@ -1218,7 +1218,7 @@
GValue result = { 0, };
gchar *str;
- str = tracker_ontology_get_service_type_by_id (g_value_get_int (&values[0]));
+ str = tracker_ontology_service_get_by_id (g_value_get_int (&values[0]));
g_value_init (&result, G_TYPE_STRING);
g_value_take_string (&result, str);
@@ -1233,7 +1233,7 @@
GValue result = { 0, };
gint id;
- id = tracker_ontology_get_id_for_service_type (g_value_get_string (&values[0]));
+ id = tracker_ontology_service_get_id_by_name (g_value_get_string (&values[0]));
g_value_init (&result, G_TYPE_INT);
g_value_set_int (&result, id);
@@ -1248,7 +1248,7 @@
GValue result = { 0, };
gint id;
- id = tracker_ontology_get_id_for_service_type (g_value_get_string (&values[0]));
+ id = tracker_ontology_service_get_id_by_name (g_value_get_string (&values[0]));
g_value_init (&result, G_TYPE_INT);
g_value_set_int (&result, id);
@@ -1661,7 +1661,7 @@
id,
g_slist_length (mimes));
- tracker_ontology_add_service_type (service,
+ tracker_ontology_service_add (service,
mimes,
mime_prefixes);
@@ -1746,7 +1746,7 @@
* id,
* g_slist_length (mimes));
*
- * tracker_ontology_add_service_type (service,
+ * tracker_ontology_service_add (service,
* mimes,
* mime_prefixes);
*/
@@ -2583,7 +2583,7 @@
g_return_val_if_fail (initialized != FALSE, NULL);
g_return_val_if_fail (service != NULL, NULL);
- type = tracker_ontology_get_db_by_service_type (service);
+ type = tracker_ontology_service_get_db_by_name (service);
switch (type) {
case TRACKER_DB_TYPE_EMAIL:
@@ -2641,7 +2641,7 @@
g_return_val_if_fail (initialized != FALSE, NULL);
g_return_val_if_fail (service != NULL, NULL);
- type = tracker_ontology_get_db_by_service_type (service);
+ type = tracker_ontology_service_get_db_by_name (service);
switch (type) {
case TRACKER_DB_TYPE_EMAIL:
Modified: branches/indexer-split/src/tracker-extract/tracker-extract.c
==============================================================================
--- branches/indexer-split/src/tracker-extract/tracker-extract.c (original)
+++ branches/indexer-split/src/tracker-extract/tracker-extract.c Mon Sep 15 10:43:31 2008
@@ -97,6 +97,8 @@
return result;
}
+#ifndef DISABLE_DEBUG
+
static void
debug_impl (const gchar *msg, ...)
{
@@ -109,6 +111,8 @@
g_fprintf (stderr, "\n");
}
+#endif /* DISABLE_DEBUG */
+
static void
initialize_extractors (void)
{
Modified: branches/indexer-split/src/tracker-indexer/modules/files.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/modules/files.c (original)
+++ branches/indexer-split/src/tracker-indexer/modules/files.c Mon Sep 15 10:43:31 2008
@@ -56,7 +56,7 @@
gchar *service_type;
mime_type = tracker_file_get_mime_type (file->path);
- service_type = tracker_ontology_get_service_type_for_mime (mime_type);
+ service_type = tracker_ontology_service_get_by_mime (mime_type);
g_free (mime_type);
return service_type;
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c Mon Sep 15 10:43:31 2008
@@ -542,8 +542,8 @@
iface = tracker_db_manager_get_db_interface_by_type (tracker_service_get_name (service_def),
TRACKER_DB_CONTENT_TYPE_METADATA);
- metadata_key = tracker_ontology_metadata_key_in_service (tracker_service_get_name (service_def),
- tracker_field_get_name (field_def));
+ metadata_key = tracker_ontology_service_get_key_metadata (tracker_service_get_name (service_def),
+ tracker_field_get_name (field_def));
if (metadata_key > 0) {
gchar *query;
@@ -691,8 +691,8 @@
break;
}
- metadata_key = tracker_ontology_metadata_key_in_service (tracker_service_get_name (service),
- tracker_field_get_name (field));
+ metadata_key = tracker_ontology_service_get_key_metadata (tracker_service_get_name (service),
+ tracker_field_get_name (field));
if (metadata_key > 0) {
tracker_db_interface_execute_query (iface, NULL,
"update Services set KeyMetadata%d = '%s' where id = %d",
@@ -768,8 +768,8 @@
break;
}
- metadata_key = tracker_ontology_metadata_key_in_service (tracker_service_get_name (service),
- tracker_field_get_name (field));
+ metadata_key = tracker_ontology_service_get_key_metadata (tracker_service_get_name (service),
+ tracker_field_get_name (field));
if (metadata_key > 0) {
tracker_db_interface_execute_query (iface, NULL,
"update Services set KeyMetadata%d = '%s' where id = %d",
Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c Mon Sep 15 10:43:31 2008
@@ -1265,7 +1265,7 @@
return;
}
- service_def = tracker_ontology_get_service_type_by_name (service_type);
+ service_def = tracker_ontology_service_get_by_name (service_type);
g_free (service_type);
if (!service_def) {
@@ -1352,7 +1352,7 @@
return;
}
- service_def = tracker_ontology_get_service_type_by_name (service_type);
+ service_def = tracker_ontology_service_get_by_name (service_type);
g_free (service_type);
if (!service_def) {
@@ -1415,11 +1415,11 @@
return;
}
- name = tracker_ontology_get_service_type_by_id (service_type_id);
- service_def = tracker_ontology_get_service_type_by_name (name);
+ name = tracker_ontology_service_get_by_id (service_type_id);
+ service_def = tracker_ontology_service_get_by_name (name);
g_free (name);
} else {
- service_def = tracker_ontology_get_service_type_by_name (service_type);
+ service_def = tracker_ontology_service_get_by_name (service_type);
service_type_id = tracker_service_get_id (service_def);
}
@@ -1487,7 +1487,7 @@
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- service_def = tracker_ontology_get_service_type_by_name (service_type);
+ service_def = tracker_ontology_service_get_by_name (service_type);
if (!service_def) {
g_set_error (error,
g_quark_from_string (TRACKER_INDEXER_ERROR),
@@ -1623,7 +1623,7 @@
guint service_id, i;
gchar *joined = NULL, *dirname = NULL, *basename = NULL;
- service_def = tracker_ontology_get_service_type_by_name (service_type);
+ service_def = tracker_ontology_service_get_by_name (service_type);
if (!service_def) {
g_set_error (error,
g_quark_from_string (TRACKER_INDEXER_ERROR),
@@ -1736,7 +1736,7 @@
return FALSE;
}
- service = tracker_ontology_get_service_type_by_name (service_type);
+ service = tracker_ontology_service_get_by_name (service_type);
g_free (service_type);
if (!service) {
Modified: branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c (original)
+++ branches/indexer-split/src/tracker-indexer/tracker-metadata-utils.c Mon Sep 15 10:43:31 2008
@@ -296,13 +296,13 @@
gchar **values, *service_type;
gint i;
- service_type = tracker_ontology_get_service_type_for_mime (mimetype);
+ service_type = tracker_ontology_service_get_by_mime (mimetype);
if (!service_type) {
return;
}
- if (!tracker_ontology_service_type_has_metadata (service_type)) {
+ if (!tracker_ontology_service_has_metadata (service_type)) {
g_free (service_type);
return;
}
@@ -742,7 +742,7 @@
gchar *text = NULL;
mimetype = tracker_file_get_mime_type (path);
- service_type = tracker_ontology_get_service_type_for_mime (mimetype);
+ service_type = tracker_ontology_service_get_by_mime (mimetype);
/* No need to filter text based files - index them directly */
if (service_type &&
Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c (original)
+++ branches/indexer-split/src/trackerd/tracker-db.c Mon Sep 15 10:43:31 2008
@@ -281,7 +281,7 @@
}
/* We only do differential updates so only changed words scores are updated */
- sid = tracker_ontology_get_id_for_service_type (service);
+ sid = tracker_ontology_service_get_id_by_name (service);
#if 0
tracker_db_update_differential_index (old_table, new_table, id, sid);
#endif
@@ -515,24 +515,24 @@
count = 0;
if (add_files) {
- services[count++] = tracker_ontology_get_id_for_service_type ("Folders");
- services[count++] = tracker_ontology_get_id_for_service_type ("Documents");
- services[count++] = tracker_ontology_get_id_for_service_type ("Images");
- services[count++] = tracker_ontology_get_id_for_service_type ("Videos");
- services[count++] = tracker_ontology_get_id_for_service_type ("Music");
- services[count++] = tracker_ontology_get_id_for_service_type ("Text");
- services[count++] = tracker_ontology_get_id_for_service_type ("Development");
- services[count++] = tracker_ontology_get_id_for_service_type ("Other");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Folders");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Documents");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Images");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Videos");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Music");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Text");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Development");
+ services[count++] = tracker_ontology_service_get_id_by_name ("Other");
}
if (add_emails) {
- services[count++] = tracker_ontology_get_id_for_service_type ("EvolutionEmails");
- services[count++] = tracker_ontology_get_id_for_service_type ("KMailEmails");
- services[count++] = tracker_ontology_get_id_for_service_type ("ThunderbirdEmails");
+ services[count++] = tracker_ontology_service_get_id_by_name ("EvolutionEmails");
+ services[count++] = tracker_ontology_service_get_id_by_name ("KMailEmails");
+ services[count++] = tracker_ontology_service_get_id_by_name ("ThunderbirdEmails");
}
if (add_conversations) {
- services[count++] = tracker_ontology_get_id_for_service_type ("GaimConversations");
+ services[count++] = tracker_ontology_service_get_id_by_name ("GaimConversations");
}
services[count] = 0;
@@ -667,7 +667,7 @@
gint key_field;
/* Replace with tracker_ontology_get_field_column_in_services */
- key_field = tracker_ontology_metadata_key_in_service (service, meta_name);
+ key_field = tracker_ontology_service_get_key_metadata (service, meta_name);
if (key_field > 0) {
return g_strdup_printf ("KeyMetadata%d", key_field);
@@ -1553,7 +1553,7 @@
str = g_string_new ("");
}
- key_field = tracker_ontology_metadata_key_in_service (res_service, key);
+ key_field = tracker_ontology_service_get_key_metadata (res_service, key);
update_index =
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
@@ -1586,7 +1586,7 @@
/* Backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
service_id,
tracker_field_get_id (def),
@@ -1620,7 +1620,7 @@
/* Backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface, service_id, tracker_field_get_id (def), values[i]);
}
@@ -1667,7 +1667,7 @@
/* Backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
service_id,
tracker_field_get_id (def),
@@ -1701,7 +1701,7 @@
/* Backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
service_id,
tracker_field_get_id (def),
@@ -1727,7 +1727,7 @@
/* Backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
service_id,
tracker_field_get_id (def),
@@ -1768,7 +1768,7 @@
/* backup non-embedded data for embedded services */
if (do_backup &&
!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service_type)) {
+ tracker_ontology_service_has_embedded (service_type)) {
backup_non_embedded_metadata (iface,
service_id,
tracker_field_get_id (def),
@@ -1870,7 +1870,7 @@
new_value = NULL;
if (!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service)) {
+ tracker_ontology_service_has_embedded (service)) {
backup_delete_non_embedded_metadata_value (iface,
id,
tracker_field_get_id (def),
@@ -1884,7 +1884,7 @@
return;
}
- key_field = tracker_ontology_metadata_key_in_service (res_service, key);
+ key_field = tracker_ontology_service_get_key_metadata (res_service, key);
update_index =
tracker_field_get_data_type (def) == TRACKER_FIELD_TYPE_INDEX ||
@@ -2035,7 +2035,7 @@
}
if (!tracker_field_get_embedded (def) &&
- tracker_ontology_service_type_has_embedded (service)) {
+ tracker_ontology_service_has_embedded (service)) {
backup_delete_non_embedded_metadata (iface,
id,
tracker_field_get_id (def));
@@ -2048,7 +2048,7 @@
return;
}
- key_field = tracker_ontology_metadata_key_in_service (res_service, key);
+ key_field = tracker_ontology_service_get_key_metadata (res_service, key);
update_index =
update_indexes &&
@@ -2568,7 +2568,7 @@
str_mtime = tracker_gint32_to_string (info->mtime);
str_offset = tracker_gint32_to_string (info->offset);
- service_type_id = tracker_ontology_get_id_for_service_type (service);
+ service_type_id = tracker_ontology_service_get_id_by_name (service);
if (info->mime) {
g_debug ("service id for %s is %d and sid is %s with mime %s",
@@ -2620,7 +2620,7 @@
g_object_unref (result_set_proc);
}
- parent = tracker_ontology_get_parent_service (service);
+ parent = tracker_ontology_service_get_parent (service);
if (parent) {
result_set_proc = tracker_db_exec_proc (iface,
@@ -2675,7 +2675,7 @@
tracker_db_result_set_get (result_set, 3, &service_type_id, -1);
g_object_unref (result_set);
- result = tracker_ontology_get_service_type_by_id (service_type_id);
+ result = tracker_ontology_service_get_by_id (service_type_id);
}
return result;
@@ -2726,7 +2726,7 @@
g_return_val_if_fail (service != NULL, NULL);
/* Do we really need service here? */
- service_id = tracker_ontology_get_id_for_service_type (service);
+ service_id = tracker_ontology_service_get_id_by_name (service);
if (service_id == -1) {
return NULL;
Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c (original)
+++ branches/indexer-split/src/trackerd/tracker-files.c Mon Sep 15 10:43:31 2008
@@ -292,7 +292,7 @@
}
/* Get service from mime */
- value = tracker_ontology_get_service_type_for_mime (mime);
+ value = tracker_ontology_service_get_by_mime (mime);
if (value) {
@@ -503,7 +503,7 @@
offset,
max_hits);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ 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",
Modified: branches/indexer-split/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.c (original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.c Mon Sep 15 10:43:31 2008
@@ -133,7 +133,7 @@
"service type:'%s'",
service_type);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -182,7 +182,7 @@
service_type,
uri);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -258,7 +258,7 @@
service_type,
uri);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -337,7 +337,7 @@
service_type,
uri);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -416,7 +416,7 @@
service_type,
uri);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -509,7 +509,7 @@
offset,
max_hits);
- if (!tracker_ontology_is_valid_service_type (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",
Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c (original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c Mon Sep 15 10:43:31 2008
@@ -154,7 +154,7 @@
"service type:'%s'",
service_type);
- if (!tracker_ontology_is_valid_service_type (service_type)) {
+ 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",
@@ -259,7 +259,7 @@
"service type:'%s' uri:'%s'",
service_type, uri);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -405,7 +405,7 @@
service_type);
if (strcmp (service_type, "*") != 0 &&
- !tracker_ontology_is_valid_service_type (service_type)) {
+ !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",
@@ -506,7 +506,7 @@
service_type,
query_condition);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -666,7 +666,7 @@
query_condition,
count_field);
- if (!tracker_ontology_is_valid_service_type (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",
@@ -859,7 +859,7 @@
field,
query_condition);
- if (!tracker_ontology_is_valid_service_type (service_type)) {
+ 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",
@@ -994,7 +994,7 @@
field,
query_condition);
- if (!tracker_ontology_is_valid_service_type (service_type)) {
+ 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",
Modified: branches/indexer-split/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.c (original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.c Mon Sep 15 10:43:31 2008
@@ -862,7 +862,7 @@
/* Update service's parent count too (if it has a
* parent).
*/
- parent_id = tracker_ontology_get_parent_id_for_service_id (rank.service_type_id);
+ parent_id = tracker_ontology_service_get_parent_id_by_id (rank.service_type_id);
if (parent_id != -1) {
p = g_hash_table_lookup (table, GINT_TO_POINTER (parent_id));
Modified: branches/indexer-split/src/trackerd/tracker-rdf-query.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-rdf-query.c (original)
+++ branches/indexer-split/src/trackerd/tracker-rdf-query.c Mon Sep 15 10:43:31 2008
@@ -1103,7 +1103,7 @@
int type;
result = g_string_new ("");
- type = tracker_ontology_get_id_for_service_type (service);
+ type = tracker_ontology_service_get_id_by_name (service);
switch (type) {
Modified: branches/indexer-split/src/trackerd/tracker-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-search.c Mon Sep 15 10:43:31 2008
@@ -451,7 +451,7 @@
service,
search_text);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -547,7 +547,7 @@
g_value_init (&value, G_TYPE_STRING);
g_value_take_string (&value,
- tracker_ontology_get_service_type_by_id (count.service_type_id));
+ tracker_ontology_service_get_by_id (count.service_type_id));
_tracker_db_result_set_set_value (result_set, 0, &value);
g_value_unset (&value);
@@ -605,7 +605,7 @@
offset,
max_hits);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -709,7 +709,7 @@
offset,
max_hits);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -781,7 +781,7 @@
search_text,
id);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -946,7 +946,7 @@
offset,
max_hits);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -1012,7 +1012,7 @@
search_text,
id);
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
g_set_error (&actual_error,
TRACKER_DBUS_ERROR,
0,
@@ -1104,7 +1104,7 @@
sort_by_service ? "yes" : "no",
sort_desc ? "yes" : "no");
- if (!tracker_ontology_is_valid_service_type (service)) {
+ if (!tracker_ontology_service_is_valid (service)) {
tracker_dbus_request_failed (request_id,
&actual_error,
0,
Modified: branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c
==============================================================================
--- branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c (original)
+++ branches/indexer-split/tests/libtracker-common/tracker-ontology-test.c Mon Sep 15 10:43:31 2008
@@ -168,13 +168,13 @@
expected_results->def = def;
expected_results->parent_def = parent_def;
- tracker_ontology_add_service_type (def, NULL, NULL);
- tracker_ontology_add_service_type (parent_def, mimes, mime_prefixes);
- tracker_ontology_add_service_type (other_def, NULL, NULL);
- tracker_ontology_add_service_type (conv_def, NULL, NULL);
- tracker_ontology_add_service_type (gaim_def, NULL, NULL);
- tracker_ontology_add_service_type (gossip_def, NULL, NULL);
- tracker_ontology_add_service_type (new_gaim_def, NULL, NULL);
+ tracker_ontology_service_add (def, NULL, NULL);
+ tracker_ontology_service_add (parent_def, mimes, mime_prefixes);
+ tracker_ontology_service_add (other_def, NULL, NULL);
+ tracker_ontology_service_add (conv_def, NULL, NULL);
+ tracker_ontology_service_add (gaim_def, NULL, NULL);
+ tracker_ontology_service_add (gossip_def, NULL, NULL);
+ tracker_ontology_service_add (new_gaim_def, NULL, NULL);
tracker_ontology_add_field (field_title);
@@ -188,9 +188,9 @@
{
gint result_int;
- result_int = tracker_ontology_get_id_for_service_type ("Test service");
+ result_int = tracker_ontology_service_get_id_by_name ("Test service");
g_assert_cmpint (result_int, ==, 0);
- result_int = tracker_ontology_get_id_for_service_type ("trash");
+ result_int = tracker_ontology_service_get_id_by_name ("trash");
g_assert_cmpint (result_int, ==, -1);
}
@@ -200,10 +200,10 @@
{
gchar *result_string;
- result_string = tracker_ontology_get_service_type_by_id (0);
+ result_string = tracker_ontology_service_get_by_id (0);
g_assert ( g_str_equal (result_string, "Test service"));
g_free (result_string);
- result_string = tracker_ontology_get_service_type_by_id (20);
+ result_string = tracker_ontology_service_get_by_id (20);
g_assert (!result_string);
}
@@ -213,10 +213,10 @@
{
gchar *result_string;
- result_string = tracker_ontology_get_parent_service_by_id (0);
+ result_string = tracker_ontology_service_get_parent_by_id (0);
g_assert ( g_str_equal (result_string, "Parent service"));
g_free (result_string);
- result_string = tracker_ontology_get_parent_service_by_id (1);
+ result_string = tracker_ontology_service_get_parent_by_id (1);
g_assert (!result_string);
}
@@ -225,9 +225,9 @@
{
gint result_int;
- result_int = tracker_ontology_get_parent_id_for_service_id (0);
+ result_int = tracker_ontology_service_get_parent_id_by_id (0);
g_assert_cmpint (result_int, ==, 1);
- result_int = tracker_ontology_get_parent_id_for_service_id (1);
+ result_int = tracker_ontology_service_get_parent_id_by_id (1);
g_assert_cmpint (result_int, ==, -1);
}
@@ -236,10 +236,10 @@
{
gchar *result_string;
- result_string = tracker_ontology_get_parent_service ("Test service");
+ result_string = tracker_ontology_service_get_parent ("Test service");
g_assert (g_str_equal (result_string, "Parent service"));
g_free (result_string);
- result_string = tracker_ontology_get_parent_service ("Parent service");
+ result_string = tracker_ontology_service_get_parent ("Parent service");
g_assert (!result_string);
}
@@ -248,15 +248,15 @@
{
gchar *value;
- value = tracker_ontology_get_service_type_for_mime ("application/rtf");
+ value = tracker_ontology_service_get_by_mime ("application/rtf");
g_assert ( g_str_equal ("Parent service", value));
g_free (value);
- value = tracker_ontology_get_service_type_for_mime ("images/jpeg");
+ value = tracker_ontology_service_get_by_mime ("images/jpeg");
g_assert ( g_str_equal ("Parent service", value));
g_free (value);
- value = tracker_ontology_get_service_type_for_mime ("noexists/bla");
+ value = tracker_ontology_service_get_by_mime ("noexists/bla");
g_assert ( g_str_equal ("Other", value));
g_free (value);
}
@@ -266,11 +266,11 @@
{
TrackerService *result_def;
- result_def = tracker_ontology_get_service_type_by_name ("Test service");
+ result_def = tracker_ontology_service_get_by_name ("Test service");
g_assert (test_cmp_servicedef_equals (result_def, expected_results->def));
- result_def = tracker_ontology_get_service_type_by_name ("No no no");
+ result_def = tracker_ontology_service_get_by_name ("No no no");
g_assert (!test_cmp_servicedef_equals (result_def, expected_results->def));
- result_def = tracker_ontology_get_service_type_by_name ("Parent service");
+ result_def = tracker_ontology_service_get_by_name ("Parent service");
g_assert (test_cmp_servicedef_equals (result_def, expected_results->parent_def));
}
@@ -279,39 +279,39 @@
{
TrackerDBType result_db;
- result_db = tracker_ontology_get_db_by_service_type ("Test service");
+ result_db = tracker_ontology_service_get_db_by_name ("Test service");
g_assert (result_db == TRACKER_DB_TYPE_FILES); // ????? HARDCODED IN tracker-ontology!!!!!
- result_db = tracker_ontology_get_db_by_service_type ("trash");
+ result_db = tracker_ontology_service_get_db_by_name ("trash");
g_assert (result_db == TRACKER_DB_TYPE_FILES);
}
static void
test_is_service_embedded (void)
{
- g_assert (tracker_ontology_service_type_has_embedded ("Test service"));
- g_assert (!tracker_ontology_service_type_has_embedded ("Parent service"));
- g_assert (!tracker_ontology_service_type_has_embedded ("Trash"));
+ g_assert (tracker_ontology_service_has_embedded ("Test service"));
+ g_assert (!tracker_ontology_service_has_embedded ("Parent service"));
+ g_assert (!tracker_ontology_service_has_embedded ("Trash"));
}
static void
test_has_thumbnails (void)
{
- g_assert (tracker_ontology_service_type_has_thumbnails ("Test service"));
- g_assert (!tracker_ontology_service_type_has_thumbnails ("trash"));
+ g_assert (tracker_ontology_service_has_thumbnails ("Test service"));
+ g_assert (!tracker_ontology_service_has_thumbnails ("trash"));
}
static void
test_has_text (void)
{
- g_assert (tracker_ontology_service_type_has_text ("Test service"));
- g_assert (!tracker_ontology_service_type_has_text ("trash"));
+ g_assert (tracker_ontology_service_has_text ("Test service"));
+ g_assert (!tracker_ontology_service_has_text ("trash"));
}
static void
test_has_metadata (void)
{
- g_assert (!tracker_ontology_service_type_has_metadata ("Test service"));
- g_assert (!tracker_ontology_service_type_has_metadata ("trash"));
+ g_assert (!tracker_ontology_service_has_metadata ("Test service"));
+ g_assert (!tracker_ontology_service_has_metadata ("trash"));
}
static void
@@ -375,12 +375,12 @@
{
gint key;
- key = tracker_ontology_metadata_key_in_service ("Applications",
- "Key:MetaData1");
+ key = tracker_ontology_service_get_key_metadata ("Applications",
+ "Key:MetaData1");
g_assert_cmpint (key, ==, 1);
- key = tracker_ontology_metadata_key_in_service ("Applications",
- "Key:MetaDataUnknown");
+ key = tracker_ontology_service_get_key_metadata ("Applications",
+ "Key:MetaDataUnknown");
g_assert_cmpint (key, ==, 0);
}
Modified: branches/indexer-split/tests/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/tests/libtracker-db/Makefile.am (original)
+++ branches/indexer-split/tests/libtracker-db/Makefile.am Mon Sep 15 10:43:31 2008
@@ -9,32 +9,32 @@
## tracker-db-manager-attach \
## tracker-db-manager-custom \
-TEST_PROGS += \
- tracker-db-dbus \
- union-performance \
- tracker-index-reader \
+TEST_PROGS += \
+ tracker-db-dbus \
+ union-performance \
+ tracker-index-reader \
tracker-index-writer
-INCLUDES = \
- -DG_LOG_DOMAIN=\"Tracker\" \
- -I$(top_srcdir)/src \
- -I$(top_srcdir)/tests/common \
- $(DBUS_CFLAGS) \
- $(SQLITE3_CFLAGS) \
- $(QDBM_CFLAGS) \
- $(GMODULE_CFLAGS) \
- $(GTHREAD_CFLAGS) \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"Tracker\" \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tests/common \
+ $(DBUS_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(QDBM_CFLAGS) \
+ $(GMODULE_CFLAGS) \
+ $(GTHREAD_CFLAGS) \
$(GLIB2_CFLAGS)
-union_performance_SOURCES = \
- tracker-db-manager-common.h \
- tracker-db-manager-common.c \
+union_performance_SOURCES = \
+ tracker-db-manager-common.h \
+ tracker-db-manager-common.c \
union-performance.c
-union_performance_LDADD = \
- $(top_builddir)/src/libtracker-db/libtracker-db.la \
+union_performance_LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/tests/common/libtracker-testcommon.la \
$(SQLITE3_LIBS) \
$(QDBM_LIBS) \
@@ -91,12 +91,12 @@
# $(GLIB2_LIBS) \
# -lz
-tracker_db_dbus_SOURCES = \
+tracker_db_dbus_SOURCES = \
tracker-db-dbus-test.c
tracker_db_dbus_LDADD = \
- $(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
+ $(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/tests/common/libtracker-testcommon.la \
$(SQLITE3_LIBS) \
$(GMODULE_LIBS) \
@@ -105,10 +105,10 @@
-lz
-tracker_index_writer_SOURCES = \
+tracker_index_writer_SOURCES = \
tracker-index-writer-test.c
-tracker_index_writer_LDADD = \
+tracker_index_writer_LDADD = \
$(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(top_builddir)/tests/common/libtracker-testcommon.la \
@@ -118,16 +118,17 @@
$(GLIB2_LIBS)
-tracker_index_reader_SOURCES = \
+tracker_index_reader_SOURCES = \
tracker-index-reader-test.c
-tracker_index_reader_LDADD = \
- $(top_builddir)/tests/common/libtracker-testcommon.la \
+tracker_index_reader_LDADD = \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
- $(GMODULE_LIBS) \
- $(GTHREAD_LIBS) \
- $(GLIB2_LIBS) \
- $(DBUS_LIBS) \
- $(GIO_LIBS) \
+ $(top_builddir)/tests/common/libtracker-testcommon.la \
+ $(GMODULE_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GLIB2_LIBS) \
+ $(DBUS_LIBS) \
+ $(GIO_LIBS) \
$(QDBM_LIBS)
Modified: branches/indexer-split/tests/tracker-fts/tracker-fts-test.c
==============================================================================
--- branches/indexer-split/tests/tracker-fts/tracker-fts-test.c (original)
+++ branches/indexer-split/tests/tracker-fts/tracker-fts-test.c Mon Sep 15 10:43:31 2008
@@ -1,70 +1,92 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008, 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 <stdio.h>
+#include <stdlib.h>
+
#include <sqlite3.h>
+
#include <glib.h>
+#include <glib-object.h>
-static int
-callback (void *NotUsed, int argc, char **argv, char **azColName)
+static gint
+callback (void *NotUsed,
+ gint argc,
+ gchar **argv,
+ gchar **azColName)
{
- int i;
- for (i=0; i<argc; i++){
+ gint i;
+
+ for (i = 0; i < argc; i++) {
printf("%s = %s\n", azColName[i], argv[i] ? argv[i] : "NULL");
}
printf("\n");
+
return 0;
}
-
static void
-exec_sql (sqlite3 *db, const char *sql)
+exec_sql (sqlite3 *db,
+ const gchar *sql)
{
- char *zErrMsg = 0;
-
-
-
- int rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
+ gchar *zErrMsg;
+ gint rc;
+
+ rc = sqlite3_exec (db, sql , callback, 0, &zErrMsg);
- if( rc!=SQLITE_OK ){
- fprintf(stderr, "SQL error: %s\n", zErrMsg);
- sqlite3_free(zErrMsg);
+ if (rc != SQLITE_OK) {
+ g_printerr ("SQL error: %s\n", zErrMsg);
+ sqlite3_free (zErrMsg);
}
-
-
-
}
-
-
int
main (int argc, char **argv)
{
- sqlite3 *db;
- char *zErrMsg = 0;
- int rc;
- gboolean db_exists = FALSE;
-
+ sqlite3 *db;
+ gint rc;
+ gboolean db_exists = FALSE;
+ gchar *st = NULL;
+ gchar *sql;
+
g_type_init ();
g_thread_init (NULL);
- if( argc != 2 ){
- fprintf(stderr, "Usage: %s MATCH_TERM\n", argv[0]);
- fprintf(stderr, "EG: %s stew\n", argv[0]);
- exit(1);
+ if (argc != 2) {
+ g_printerr ("Usage: %s MATCH_TERM\n", argv[0]);
+ g_printerr ("EG: %s stew\n", argv[0]);
+ return EXIT_FAILURE;
}
db_exists = g_file_test ("/tmp/test.db", G_FILE_TEST_EXISTS);
- rc = sqlite3_open("/tmp/test.db", &db);
- if( rc ){
- fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db));
+ rc = sqlite3_open ("/tmp/test.db", &db);
+ if (rc) {
+ g_printerr ("Can't open database: %s\n", sqlite3_errmsg(db));
sqlite3_close(db);
- exit(1);
+ return EXIT_FAILURE;
}
- sqlite3_enable_load_extension(db, 1);
-
- char *st = NULL;
-
+ sqlite3_enable_load_extension (db, 1);
sqlite3_load_extension (db, "tracker-fts.so", NULL, &st);
if (st) {
@@ -79,14 +101,13 @@
exec_sql (db, "insert into recipe (name, ingredients) values ('broccoli pie', 'broccoli,cheese,onions and flour.')");
exec_sql (db, "insert into recipe (name, ingredients) values ('pumpkin pie', 'pumpkin,sugar,flour and butter.')");
}
-
-
- char *sql = g_strdup_printf ("select rowid, name, ingredients, snippet(recipe), offsets(recipe) from recipe where recipe match '%s'", argv[1]);
+
+ sql = g_strdup_printf ("select rowid, name, ingredients, snippet(recipe), offsets(recipe) from recipe where recipe match '%s'", argv[1]);
exec_sql (db, sql);
g_free (sql);
-
sqlite3_close(db);
- return 0;
+
+ return EXIT_SUCCESS;
}
Modified: branches/indexer-split/utils/qdbm/Makefile.am
==============================================================================
--- branches/indexer-split/utils/qdbm/Makefile.am (original)
+++ branches/indexer-split/utils/qdbm/Makefile.am Mon Sep 15 10:43:31 2008
@@ -19,6 +19,7 @@
search-word.c
search_LDADD = \
+ $(top_builddir)/src/libtracker-common/libtracker-common.la \
$(top_builddir)/src/libtracker-db/libtracker-db.la \
$(QDBM_LIBS) \
$(GLIB2_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
