[tracker/ontology-cope-for-master: 2/11] refactor: renamed tracker-ontology to tracker-ontologies
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/ontology-cope-for-master: 2/11] refactor: renamed tracker-ontology to tracker-ontologies
- Date: Mon, 22 Feb 2010 14:26:13 +0000 (UTC)
commit 88885d325249fd9011b9c9e1c760ef7cf69a6fd6
Author: Philip Van Hoof <philip codeminded be>
Date: Tue Feb 16 13:53:05 2010 +0100
refactor: renamed tracker-ontology to tracker-ontologies
docs/tools/ontology-graph.c | 48 +++++++-------
src/libtracker-common/Makefile.am | 4 +-
src/libtracker-common/libtracker-common.vapi | 4 +-
src/libtracker-common/tracker-class.c | 4 +-
src/libtracker-common/tracker-common.h | 2 +-
.../{tracker-ontology.c => tracker-ontologies.c} | 28 ++++----
.../{tracker-ontology.h => tracker-ontologies.h} | 32 +++++-----
src/libtracker-common/tracker-property.c | 4 +-
src/libtracker-data/tracker-data-manager.c | 72 ++++++++++----------
src/libtracker-data/tracker-data-manager.h | 2 +-
src/libtracker-data/tracker-data-query.h | 2 +-
src/libtracker-data/tracker-data-update.c | 24 +++---
src/libtracker-data/tracker-data-update.h | 2 +-
src/libtracker-data/tracker-sparql-query.vala | 24 +++---
src/libtracker-db/tracker-db-manager.c | 12 ++--
src/libtracker-extract/tracker-xmp.c | 2 +-
src/libtracker-fts/tracker-fts.c | 2 +-
src/plugins/evolution/tracker-evolution-plugin.c | 2 +-
src/tracker-extract/tracker-extract-abw.c | 2 +-
src/tracker-extract/tracker-extract-flac.c | 2 +-
src/tracker-extract/tracker-extract-gstreamer.c | 2 +-
src/tracker-extract/tracker-extract-html.c | 2 +-
src/tracker-extract/tracker-extract-jpeg.c | 2 +-
src/tracker-extract/tracker-extract-libxine.c | 2 +-
src/tracker-extract/tracker-extract-mp3.c | 2 +-
src/tracker-extract/tracker-extract-mplayer.c | 2 +-
src/tracker-extract/tracker-extract-msoffice.c | 2 +-
src/tracker-extract/tracker-extract-oasis.c | 2 +-
src/tracker-extract/tracker-extract-pdf.c | 3 +-
src/tracker-extract/tracker-extract-playlist.c | 2 +-
src/tracker-extract/tracker-extract-png.c | 2 +-
src/tracker-extract/tracker-extract-ps.c | 2 +-
src/tracker-extract/tracker-extract-tiff.c | 2 +-
src/tracker-extract/tracker-extract-totem.c | 2 +-
src/tracker-extract/tracker-extract-vorbis.c | 2 +-
src/tracker-extract/tracker-extract-xmp.c | 2 +-
src/tracker-extract/tracker-topanalyzer.cpp | 2 +-
src/tracker-miner-fs/tracker-main.c | 2 +-
src/tracker-miner-fs/tracker-miner-applications.c | 2 +-
src/tracker-miner-fs/tracker-miner-files.c | 2 +-
src/tracker-store/tracker-dbus.c | 4 +-
src/tracker-store/tracker-events.c | 2 +-
src/tracker-store/tracker-main.c | 2 +-
src/tracker-store/tracker-resource-class.c | 2 +-
src/tracker-store/tracker-resources.c | 2 +-
src/tracker-store/tracker-statistics.c | 4 +-
src/tracker-store/tracker-writeback.c | 2 +-
src/tracker-writeback/tracker-writeback-xmp.c | 2 +-
tests/libtracker-fts/tracker-fts-test.c | 2 +-
49 files changed, 169 insertions(+), 168 deletions(-)
---
diff --git a/docs/tools/ontology-graph.c b/docs/tools/ontology-graph.c
index 3ae20c1..cc8ad5e 100644
--- a/docs/tools/ontology-graph.c
+++ b/docs/tools/ontology-graph.c
@@ -87,31 +87,31 @@ load_ontology_file_from_path (const gchar *ontology_file)
if (g_strcmp0 (object, RDFS_CLASS) == 0) {
TrackerClass *class;
- if (tracker_ontology_get_class_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_class_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of class %s", ontology_file, subject);
continue;
}
class = tracker_class_new ();
tracker_class_set_uri (class, subject);
- tracker_ontology_add_class (class);
+ tracker_ontologies_add_class (class);
g_object_unref (class);
} else if (g_strcmp0 (object, RDF_PROPERTY) == 0) {
TrackerProperty *property;
- if (tracker_ontology_get_property_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_property_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of property %s", ontology_file, subject);
continue;
}
property = tracker_property_new ();
tracker_property_set_uri (property, subject);
- tracker_ontology_add_property (property);
+ tracker_ontologies_add_property (property);
g_object_unref (property);
} else if (g_strcmp0 (object, NRL_INVERSE_FUNCTIONAL_PROPERTY) == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -121,26 +121,26 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (object, TRACKER_PREFIX "Namespace") == 0) {
TrackerNamespace *namespace;
- if (tracker_ontology_get_namespace_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_namespace_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of namespace %s", ontology_file, subject);
continue;
}
namespace = tracker_namespace_new ();
tracker_namespace_set_uri (namespace, subject);
- tracker_ontology_add_namespace (namespace);
+ tracker_ontologies_add_namespace (namespace);
g_object_unref (namespace);
}
} else if (g_strcmp0 (predicate, RDFS_SUB_CLASS_OF) == 0) {
TrackerClass *class, *super_class;
- class = tracker_ontology_get_class_by_uri (subject);
+ class = tracker_ontologies_get_class_by_uri (subject);
if (class == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, subject);
continue;
}
- super_class = tracker_ontology_get_class_by_uri (object);
+ super_class = tracker_ontologies_get_class_by_uri (object);
if (super_class == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
continue;
@@ -150,13 +150,13 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, RDFS_SUB_PROPERTY_OF) == 0) {
TrackerProperty *property, *super_property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
}
- super_property = tracker_ontology_get_property_by_uri (object);
+ super_property = tracker_ontologies_get_property_by_uri (object);
if (super_property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, object);
continue;
@@ -167,13 +167,13 @@ load_ontology_file_from_path (const gchar *ontology_file)
TrackerProperty *property;
TrackerClass *domain;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
}
- domain = tracker_ontology_get_class_by_uri (object);
+ domain = tracker_ontologies_get_class_by_uri (object);
if (domain == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
continue;
@@ -184,13 +184,13 @@ load_ontology_file_from_path (const gchar *ontology_file)
TrackerProperty *property;
TrackerClass *range;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
}
- range = tracker_ontology_get_class_by_uri (object);
+ range = tracker_ontologies_get_class_by_uri (object);
if (range == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
continue;
@@ -200,7 +200,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, NRL_MAX_CARDINALITY) == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -212,7 +212,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "indexed") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -224,7 +224,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "transient") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -236,7 +236,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "isAnnotation") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -248,7 +248,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "fulltextIndexed") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
continue;
@@ -260,7 +260,7 @@ load_ontology_file_from_path (const gchar *ontology_file)
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "prefix") == 0) {
TrackerNamespace *namespace;
- namespace = tracker_ontology_get_namespace_by_uri (subject);
+ namespace = tracker_ontologies_get_namespace_by_uri (subject);
if (namespace == NULL) {
g_critical ("%s: Unknown namespace %s", ontology_file, subject);
continue;
@@ -504,7 +504,7 @@ generate_class_info (FILE *f)
g_str_equal,
NULL, NULL);
- classes = tracker_ontology_get_classes (&length);
+ classes = tracker_ontologies_get_classes (&length);
push_context_graph (f, "G", FALSE);
@@ -663,7 +663,7 @@ main (int argc, char *argv[])
}
g_assert (f != NULL);
- tracker_ontology_init ();
+ tracker_ontologies_init ();
dir = g_file_new_for_commandline_arg (ontology_dir);
load_ontology_dir (dir);
@@ -671,7 +671,7 @@ main (int argc, char *argv[])
generate_class_info (f);
- tracker_ontology_shutdown ();
+ tracker_ontologies_shutdown ();
fclose (f);
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index d8469dd..08e39c0 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -68,7 +68,7 @@ libtracker_common_la_SOURCES = \
tracker-language.c \
tracker-log.c \
tracker-namespace.c \
- tracker-ontology.c \
+ tracker-ontologies.c \
tracker-property.c \
tracker-type-utils.c \
tracker-utils.c \
@@ -93,7 +93,7 @@ libtracker_commoninclude_HEADERS = \
tracker-keyfile-object.h \
tracker-language.h \
tracker-namespace.h \
- tracker-ontology.h \
+ tracker-ontologies.h \
tracker-property.h \
tracker-turtle-writer.h \
tracker-type-utils.h \
diff --git a/src/libtracker-common/libtracker-common.vapi b/src/libtracker-common/libtracker-common.vapi
index ff69dd6..e175151 100644
--- a/src/libtracker-common/libtracker-common.vapi
+++ b/src/libtracker-common/libtracker-common.vapi
@@ -55,8 +55,8 @@ namespace Tracker {
RESOURCE
}
- [CCode (cheader_filename = "libtracker-common/tracker-ontology.h")]
- namespace Ontology {
+ [CCode (cheader_filename = "libtracker-common/tracker-ontologies.h")]
+ namespace Ontologies {
public weak Class get_class_by_uri (string class_uri);
public weak Property get_property_by_uri (string property_uri);
public weak Namespace[] get_namespaces ();
diff --git a/src/libtracker-common/tracker-class.c b/src/libtracker-common/tracker-class.c
index ca12a2a..4cf73ae 100644
--- a/src/libtracker-common/tracker-class.c
+++ b/src/libtracker-common/tracker-class.c
@@ -27,7 +27,7 @@
#include "tracker-class.h"
#include "tracker-namespace.h"
-#include "tracker-ontology.h"
+#include "tracker-ontologies.h"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_CLASS, TrackerClassPriv))
@@ -287,7 +287,7 @@ tracker_class_set_uri (TrackerClass *service,
g_critical ("Unknown namespace of class %s", priv->uri);
} else {
namespace_uri = g_strndup (priv->uri, hash - priv->uri + 1);
- namespace = tracker_ontology_get_namespace_by_uri (namespace_uri);
+ namespace = tracker_ontologies_get_namespace_by_uri (namespace_uri);
if (namespace == NULL) {
g_critical ("Unknown namespace %s of class %s", namespace_uri, priv->uri);
} else {
diff --git a/src/libtracker-common/tracker-common.h b/src/libtracker-common/tracker-common.h
index 1dc915a..7b1632b 100644
--- a/src/libtracker-common/tracker-common.h
+++ b/src/libtracker-common/tracker-common.h
@@ -48,7 +48,7 @@ G_BEGIN_DECLS
#include "tracker-keyfile-object.h"
#include "tracker-language.h"
#include "tracker-namespace.h"
-#include "tracker-ontology.h"
+#include "tracker-ontologies.h"
#include "tracker-property.h"
#include "tracker-type-utils.h"
#include "tracker-utils.h"
diff --git a/src/libtracker-common/tracker-ontology.c b/src/libtracker-common/tracker-ontologies.c
similarity index 88%
rename from src/libtracker-common/tracker-ontology.c
rename to src/libtracker-common/tracker-ontologies.c
index 88cb601..7d1894a 100644
--- a/src/libtracker-common/tracker-ontology.c
+++ b/src/libtracker-common/tracker-ontologies.c
@@ -25,7 +25,7 @@
#include <glib.h>
-#include "tracker-ontology.h"
+#include "tracker-ontologies.h"
static gboolean initialized;
@@ -54,7 +54,7 @@ static gpointer property_type_enum_class;
static GHashTable *id_uri_pairs;
void
-tracker_ontology_init (void)
+tracker_ontologies_init (void)
{
if (initialized) {
return;
@@ -95,7 +95,7 @@ tracker_ontology_init (void)
}
void
-tracker_ontology_shutdown (void)
+tracker_ontologies_shutdown (void)
{
if (!initialized) {
return;
@@ -129,7 +129,7 @@ tracker_ontology_shutdown (void)
}
const gchar*
-tracker_ontology_get_uri_by_id (gint id)
+tracker_ontologies_get_uri_by_id (gint id)
{
g_return_val_if_fail (id != -1, NULL);
@@ -137,7 +137,7 @@ tracker_ontology_get_uri_by_id (gint id)
}
void
-tracker_ontology_add_class (TrackerClass *service)
+tracker_ontologies_add_class (TrackerClass *service)
{
const gchar *uri, *name;
@@ -157,7 +157,7 @@ tracker_ontology_add_class (TrackerClass *service)
}
TrackerClass *
-tracker_ontology_get_class_by_uri (const gchar *class_uri)
+tracker_ontologies_get_class_by_uri (const gchar *class_uri)
{
g_return_val_if_fail (class_uri != NULL, NULL);
@@ -165,7 +165,7 @@ tracker_ontology_get_class_by_uri (const gchar *class_uri)
}
TrackerNamespace **
-tracker_ontology_get_namespaces (guint *length)
+tracker_ontologies_get_namespaces (guint *length)
{
if (G_UNLIKELY (!namespaces)) {
*length = 0;
@@ -177,7 +177,7 @@ tracker_ontology_get_namespaces (guint *length)
}
TrackerClass **
-tracker_ontology_get_classes (guint *length)
+tracker_ontologies_get_classes (guint *length)
{
if (G_UNLIKELY (!classes)) {
*length = 0;
@@ -189,7 +189,7 @@ tracker_ontology_get_classes (guint *length)
}
TrackerProperty **
-tracker_ontology_get_properties (guint *length)
+tracker_ontologies_get_properties (guint *length)
{
if (G_UNLIKELY (!properties)) {
*length = 0;
@@ -202,7 +202,7 @@ tracker_ontology_get_properties (guint *length)
/* Field mechanics */
void
-tracker_ontology_add_property (TrackerProperty *field)
+tracker_ontologies_add_property (TrackerProperty *field)
{
const gchar *uri;
@@ -218,7 +218,7 @@ tracker_ontology_add_property (TrackerProperty *field)
}
void
-tracker_ontology_add_id_uri_pair (gint id, const gchar *uri)
+tracker_ontologies_add_id_uri_pair (gint id, const gchar *uri)
{
g_hash_table_insert (id_uri_pairs,
GINT_TO_POINTER (id),
@@ -226,7 +226,7 @@ tracker_ontology_add_id_uri_pair (gint id, const gchar *uri)
}
TrackerProperty *
-tracker_ontology_get_property_by_uri (const gchar *uri)
+tracker_ontologies_get_property_by_uri (const gchar *uri)
{
g_return_val_if_fail (uri != NULL, NULL);
@@ -234,7 +234,7 @@ tracker_ontology_get_property_by_uri (const gchar *uri)
}
void
-tracker_ontology_add_namespace (TrackerNamespace *namespace)
+tracker_ontologies_add_namespace (TrackerNamespace *namespace)
{
const gchar *uri;
@@ -250,7 +250,7 @@ tracker_ontology_add_namespace (TrackerNamespace *namespace)
}
TrackerNamespace *
-tracker_ontology_get_namespace_by_uri (const gchar *uri)
+tracker_ontologies_get_namespace_by_uri (const gchar *uri)
{
g_return_val_if_fail (uri != NULL, NULL);
diff --git a/src/libtracker-common/tracker-ontology.h b/src/libtracker-common/tracker-ontologies.h
similarity index 69%
rename from src/libtracker-common/tracker-ontology.h
rename to src/libtracker-common/tracker-ontologies.h
index ca8cc38..fb66770 100644
--- a/src/libtracker-common/tracker-ontology.h
+++ b/src/libtracker-common/tracker-ontologies.h
@@ -18,8 +18,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __LIBTRACKER_COMMON_ONTOLOGY_H__
-#define __LIBTRACKER_COMMON_ONTOLOGY_H__
+#ifndef __LIBTRACKER_COMMON_ONTOLOGIES_H__
+#define __LIBTRACKER_COMMON_ONTOLOGIES_H__
#include <glib-object.h>
@@ -59,24 +59,24 @@ G_BEGIN_DECLS
#define TRACKER_NON_REMOVABLE_MEDIA_DATASOURCE_URN \
TRACKER_DATASOURCE_URN_PREFIX "9291a450-1d49-11de-8c30-0800200c9a66"
-void tracker_ontology_init (void);
-void tracker_ontology_shutdown (void);
+void tracker_ontologies_init (void);
+void tracker_ontologies_shutdown (void);
/* Service mechanics */
-void tracker_ontology_add_class (TrackerClass *service);
-TrackerClass * tracker_ontology_get_class_by_uri (const gchar *service_uri);
-TrackerNamespace **tracker_ontology_get_namespaces (guint *length);
-TrackerClass ** tracker_ontology_get_classes (guint *length);
-TrackerProperty ** tracker_ontology_get_properties (guint *length);
+void tracker_ontologies_add_class (TrackerClass *service);
+TrackerClass * tracker_ontologies_get_class_by_uri (const gchar *service_uri);
+TrackerNamespace **tracker_ontologies_get_namespaces (guint *length);
+TrackerClass ** tracker_ontologies_get_classes (guint *length);
+TrackerProperty ** tracker_ontologies_get_properties (guint *length);
/* Field mechanics */
-void tracker_ontology_add_property (TrackerProperty *field);
-TrackerProperty * tracker_ontology_get_property_by_uri (const gchar *uri);
-void tracker_ontology_add_namespace (TrackerNamespace *namespace_);
-TrackerNamespace * tracker_ontology_get_namespace_by_uri (const gchar *namespace_uri);
-const gchar* tracker_ontology_get_uri_by_id (gint id);
-void tracker_ontology_add_id_uri_pair (gint id,
- const gchar *uri);
+void tracker_ontologies_add_property (TrackerProperty *field);
+TrackerProperty * tracker_ontologies_get_property_by_uri (const gchar *uri);
+void tracker_ontologies_add_namespace (TrackerNamespace *namespace_);
+TrackerNamespace * tracker_ontologies_get_namespace_by_uri (const gchar *namespace_uri);
+const gchar* tracker_ontologies_get_uri_by_id (gint id);
+void tracker_ontologies_add_id_uri_pair (gint id,
+ const gchar *uri);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-property.c b/src/libtracker-common/tracker-property.c
index 08b2593..c091b3f 100644
--- a/src/libtracker-common/tracker-property.c
+++ b/src/libtracker-common/tracker-property.c
@@ -25,7 +25,7 @@
#include <glib.h>
#include "tracker-namespace.h"
-#include "tracker-ontology.h"
+#include "tracker-ontologies.h"
#include "tracker-property.h"
#define XSD_BOOLEAN TRACKER_XSD_PREFIX "boolean"
@@ -682,7 +682,7 @@ tracker_property_set_uri (TrackerProperty *field,
g_critical ("Unknown namespace of property %s", priv->uri);
} else {
namespace_uri = g_strndup (priv->uri, hash - priv->uri + 1);
- namespace = tracker_ontology_get_namespace_by_uri (namespace_uri);
+ namespace = tracker_ontologies_get_namespace_by_uri (namespace_uri);
if (namespace == NULL) {
g_critical ("Unknown namespace %s of property %s", namespace_uri, priv->uri);
} else {
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index b434697..0fc0c8b 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -80,7 +80,7 @@ load_ontology_statement (const gchar *ontology_file,
if (g_strcmp0 (object, RDFS_CLASS) == 0) {
TrackerClass *class;
- if (tracker_ontology_get_class_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_class_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of class %s", ontology_file, subject);
return;
}
@@ -92,13 +92,13 @@ load_ontology_statement (const gchar *ontology_file,
class = tracker_class_new ();
tracker_class_set_uri (class, subject);
tracker_class_set_id (class, subject_id);
- tracker_ontology_add_class (class);
- tracker_ontology_add_id_uri_pair (subject_id, subject);
+ tracker_ontologies_add_class (class);
+ tracker_ontologies_add_id_uri_pair (subject_id, subject);
g_object_unref (class);
} else if (g_strcmp0 (object, RDF_PROPERTY) == 0) {
TrackerProperty *property;
- if (tracker_ontology_get_property_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_property_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of property %s", ontology_file, subject);
return;
}
@@ -110,13 +110,13 @@ load_ontology_statement (const gchar *ontology_file,
property = tracker_property_new ();
tracker_property_set_uri (property, subject);
tracker_property_set_id (property, subject_id);
- tracker_ontology_add_property (property);
- tracker_ontology_add_id_uri_pair (subject_id, subject);
+ tracker_ontologies_add_property (property);
+ tracker_ontologies_add_id_uri_pair (subject_id, subject);
g_object_unref (property);
} else if (g_strcmp0 (object, NRL_INVERSE_FUNCTIONAL_PROPERTY) == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -126,14 +126,14 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (object, TRACKER_PREFIX "Namespace") == 0) {
TrackerNamespace *namespace;
- if (tracker_ontology_get_namespace_by_uri (subject) != NULL) {
+ if (tracker_ontologies_get_namespace_by_uri (subject) != NULL) {
g_critical ("%s: Duplicate definition of namespace %s", ontology_file, subject);
return;
}
namespace = tracker_namespace_new ();
tracker_namespace_set_uri (namespace, subject);
- tracker_ontology_add_namespace (namespace);
+ tracker_ontologies_add_namespace (namespace);
g_object_unref (namespace);
} else if (g_strcmp0 (object, TRACKER_PREFIX "Ontology") == 0) {
g_print ("ONTOLOGY: %s\n", subject);
@@ -143,13 +143,13 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, RDFS_SUB_CLASS_OF) == 0) {
TrackerClass *class, *super_class;
- class = tracker_ontology_get_class_by_uri (subject);
+ class = tracker_ontologies_get_class_by_uri (subject);
if (class == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, subject);
return;
}
- super_class = tracker_ontology_get_class_by_uri (object);
+ super_class = tracker_ontologies_get_class_by_uri (object);
if (super_class == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
return;
@@ -159,13 +159,13 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, RDFS_SUB_PROPERTY_OF) == 0) {
TrackerProperty *property, *super_property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
}
- super_property = tracker_ontology_get_property_by_uri (object);
+ super_property = tracker_ontologies_get_property_by_uri (object);
if (super_property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, object);
return;
@@ -176,13 +176,13 @@ load_ontology_statement (const gchar *ontology_file,
TrackerProperty *property;
TrackerClass *domain;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
}
- domain = tracker_ontology_get_class_by_uri (object);
+ domain = tracker_ontologies_get_class_by_uri (object);
if (domain == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
return;
@@ -193,13 +193,13 @@ load_ontology_statement (const gchar *ontology_file,
TrackerProperty *property;
TrackerClass *range;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
}
- range = tracker_ontology_get_class_by_uri (object);
+ range = tracker_ontologies_get_class_by_uri (object);
if (range == NULL) {
g_critical ("%s: Unknown class %s", ontology_file, object);
return;
@@ -209,7 +209,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, NRL_MAX_CARDINALITY) == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -221,7 +221,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "indexed") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -233,7 +233,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "transient") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -245,7 +245,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "isAnnotation") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -257,7 +257,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "fulltextIndexed") == 0) {
TrackerProperty *property;
- property = tracker_ontology_get_property_by_uri (subject);
+ property = tracker_ontologies_get_property_by_uri (subject);
if (property == NULL) {
g_critical ("%s: Unknown property %s", ontology_file, subject);
return;
@@ -269,7 +269,7 @@ load_ontology_statement (const gchar *ontology_file,
} else if (g_strcmp0 (predicate, TRACKER_PREFIX "prefix") == 0) {
TrackerNamespace *namespace;
- namespace = tracker_ontology_get_namespace_by_uri (subject);
+ namespace = tracker_ontologies_get_namespace_by_uri (subject);
if (namespace == NULL) {
g_critical ("%s: Unknown namespace %s", ontology_file, subject);
return;
@@ -534,7 +534,7 @@ class_add_super_classes_from_db (TrackerDBInterface *iface, TrackerClass *class)
const gchar *super_class_uri;
super_class_uri = tracker_db_cursor_get_string (cursor, 0);
- super_class = tracker_ontology_get_class_by_uri (super_class_uri);
+ super_class = tracker_ontologies_get_class_by_uri (super_class_uri);
tracker_class_add_super_class (class, super_class);
}
@@ -562,7 +562,7 @@ property_add_super_properties_from_db (TrackerDBInterface *iface, TrackerPropert
const gchar *super_property_uri;
super_property_uri = tracker_db_cursor_get_string (cursor, 0);
- super_property = tracker_ontology_get_property_by_uri (super_property_uri);
+ super_property = tracker_ontologies_get_property_by_uri (super_property_uri);
tracker_property_add_super_property (property, super_property);
}
@@ -596,7 +596,7 @@ db_get_static_data (TrackerDBInterface *iface)
tracker_namespace_set_uri (namespace, uri);
tracker_namespace_set_prefix (namespace, prefix);
- tracker_ontology_add_namespace (namespace);
+ tracker_ontologies_add_namespace (namespace);
g_object_unref (namespace);
@@ -626,8 +626,8 @@ db_get_static_data (TrackerDBInterface *iface)
tracker_class_set_uri (class, uri);
class_add_super_classes_from_db (iface, class);
- tracker_ontology_add_class (class);
- tracker_ontology_add_id_uri_pair (id, uri);
+ tracker_ontologies_add_class (class);
+ tracker_ontologies_add_id_uri_pair (id, uri);
tracker_class_set_id (class, id);
/* xsd classes do not derive from rdfs:Resource and do not use separate tables */
@@ -743,8 +743,8 @@ db_get_static_data (TrackerDBInterface *iface)
tracker_property_set_transient (property, transient);
tracker_property_set_uri (property, uri);
tracker_property_set_id (property, id);
- tracker_property_set_domain (property, tracker_ontology_get_class_by_uri (domain_uri));
- tracker_property_set_range (property, tracker_ontology_get_class_by_uri (range_uri));
+ tracker_property_set_domain (property, tracker_ontologies_get_class_by_uri (domain_uri));
+ tracker_property_set_range (property, tracker_ontologies_get_class_by_uri (range_uri));
tracker_property_set_multiple_values (property, multi_valued);
tracker_property_set_indexed (property, indexed);
tracker_property_set_fulltext_indexed (property, fulltext_indexed);
@@ -752,8 +752,8 @@ db_get_static_data (TrackerDBInterface *iface)
tracker_property_set_is_inverse_functional_property (property, is_inverse_functional_property);
property_add_super_properties_from_db (iface, property);
- tracker_ontology_add_property (property);
- tracker_ontology_add_id_uri_pair (id, uri);
+ tracker_ontologies_add_property (property);
+ tracker_ontologies_add_id_uri_pair (id, uri);
g_object_unref (property);
@@ -915,7 +915,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
g_string_append (sql, ", Available INTEGER NOT NULL");
}
- properties = tracker_ontology_get_properties (&n_props);
+ properties = tracker_ontologies_get_properties (&n_props);
class_properties = NULL;
for (i = 0; i < n_props; i++) {
@@ -989,7 +989,7 @@ create_decomposed_transient_metadata_tables (TrackerDBInterface *iface)
TrackerProperty *property;
gint i, n_props;
- properties = tracker_ontology_get_properties (&n_props);
+ properties = tracker_ontologies_get_properties (&n_props);
for (i = 0; i < n_props; i++) {
property = properties[i];
@@ -1034,8 +1034,8 @@ import_ontology_into_db (void)
iface = tracker_db_manager_get_db_interface ();
- classes = tracker_ontology_get_classes (&n_classes);
- properties = tracker_ontology_get_properties (&n_props);
+ classes = tracker_ontologies_get_classes (&n_classes);
+ properties = tracker_ontologies_get_properties (&n_props);
/* create tables */
for (i = 0; i < n_classes; i++) {
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h
index 5a976b6..ff960a4 100644
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-interface.h>
#include <libtracker-db/tracker-db-manager.h>
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index c0bf22a..6932813 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <libtracker-common/tracker-language.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-property.h>
#include <libtracker-db/tracker-db-interface.h>
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index c092ca6..f5ae099 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -27,7 +27,7 @@
#include <libtracker-common/tracker-common.h>
#include <libtracker-common/tracker-date-time.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-fts/tracker-fts.h>
@@ -1010,7 +1010,7 @@ get_old_property_values (TrackerProperty *property,
*/
tracker_fts_update_init (resource_buffer->id);
- properties = tracker_ontology_get_properties (&n_props);
+ properties = tracker_ontologies_get_properties (&n_props);
for (i = 0; i < n_props; i++) {
prop = properties[i];
@@ -1245,7 +1245,7 @@ cache_delete_resource_type (TrackerClass *class,
gchar *class_uri;
tracker_db_result_set_get (result_set, 0, &class_uri, -1);
- cache_delete_resource_type (tracker_ontology_get_class_by_uri (class_uri), graph);
+ cache_delete_resource_type (tracker_ontologies_get_class_by_uri (class_uri), graph);
g_free (class_uri);
} while (tracker_db_result_set_iter_next (result_set));
@@ -1254,7 +1254,7 @@ cache_delete_resource_type (TrackerClass *class,
/* delete all property values */
- properties = tracker_ontology_get_properties (&n_props);
+ properties = tracker_ontologies_get_properties (&n_props);
for (p = 0; p < n_props; p++) {
gboolean multiple_values, fts;
@@ -1357,7 +1357,7 @@ tracker_data_delete_statement (const gchar *graph,
}
if (object && g_strcmp0 (predicate, RDF_PREFIX "type") == 0) {
- class = tracker_ontology_get_class_by_uri (object);
+ class = tracker_ontologies_get_class_by_uri (object);
if (class != NULL) {
if (!in_journal_replay) {
tracker_db_journal_append_delete_statement_id (
@@ -1373,7 +1373,7 @@ tracker_data_delete_statement (const gchar *graph,
"Class '%s' not found in the ontology", object);
}
} else {
- field = tracker_ontology_get_property_by_uri (predicate);
+ field = tracker_ontologies_get_property_by_uri (predicate);
if (field != NULL) {
gint id = tracker_property_get_id (field);
if (!in_journal_replay) {
@@ -1504,7 +1504,7 @@ tracker_data_insert_statement (const gchar *graph,
g_return_if_fail (object != NULL);
g_return_if_fail (in_transaction);
- property = tracker_ontology_get_property_by_uri (predicate);
+ property = tracker_ontologies_get_property_by_uri (predicate);
if (property != NULL) {
if (tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_RESOURCE) {
tracker_data_insert_statement_with_uri (graph, subject, predicate, object, error);
@@ -1536,7 +1536,7 @@ tracker_data_insert_statement_with_uri (const gchar *graph,
g_return_if_fail (object != NULL);
g_return_if_fail (in_transaction);
- property = tracker_ontology_get_property_by_uri (predicate);
+ property = tracker_ontologies_get_property_by_uri (predicate);
if (property == NULL) {
if (strcmp (predicate, TRACKER_PREFIX "uri") == 0) {
/* virtual tracker:uri property */
@@ -1602,7 +1602,7 @@ tracker_data_insert_statement_with_uri (const gchar *graph,
if (strcmp (predicate, RDF_PREFIX "type") == 0) {
/* handle rdf:type statements specially to
cope with inference and insert blank rows */
- class = tracker_ontology_get_class_by_uri (object);
+ class = tracker_ontologies_get_class_by_uri (object);
if (class != NULL) {
cache_create_service_decomposed (class, graph);
} else {
@@ -1660,7 +1660,7 @@ tracker_data_insert_statement_with_string (const gchar *graph,
g_return_if_fail (object != NULL);
g_return_if_fail (in_transaction);
- property = tracker_ontology_get_property_by_uri (predicate);
+ property = tracker_ontologies_get_property_by_uri (predicate);
if (property == NULL) {
g_set_error (error, TRACKER_DATA_ERROR, TRACKER_DATA_ERROR_UNKNOWN_PROPERTY,
"Property '%s' not found in the ontology", predicate);
@@ -2062,7 +2062,7 @@ tracker_data_delete_resource_description (const gchar *graph,
return;
}
- properties = tracker_ontology_get_properties (&n_props);
+ properties = tracker_ontologies_get_properties (&n_props);
stmt = tracker_db_interface_create_statement (iface, "SELECT (SELECT Uri FROM Resource WHERE ID = \"rdf:type\") FROM \"rdfs:Resource_rdf:type\" WHERE ID = ?");
tracker_db_statement_bind_int (stmt, 0, resource_id);
@@ -2075,7 +2075,7 @@ tracker_data_delete_resource_description (const gchar *graph,
tracker_db_result_set_get (result_set, 0, &class_uri, -1);
- class = tracker_ontology_get_class_by_uri (class_uri);
+ class = tracker_ontologies_get_class_by_uri (class_uri);
if (class == NULL) {
g_warning ("Class '%s' not found in the ontology", class_uri);
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 71614ed..da3d429 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -23,7 +23,7 @@
#include <glib.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-interface.h>
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index b755470..f945fda 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -129,9 +129,9 @@ public class Tracker.SparqlQuery : Object {
do {
Value value;
result_set._get_value (0, out value);
- var domain = Ontology.get_class_by_uri (value.get_string ());
+ var domain = Ontologies.get_class_by_uri (value.get_string ());
- foreach (Property prop in Ontology.get_properties ()) {
+ foreach (Property prop in Ontologies.get_properties ()) {
if (prop.domain == domain) {
if (first) {
first = false;
@@ -176,9 +176,9 @@ public class Tracker.SparqlQuery : Object {
do {
Value value;
result_set._get_value (0, out value);
- var range = Ontology.get_class_by_uri (value.get_string ());
+ var range = Ontologies.get_class_by_uri (value.get_string ());
- foreach (Property prop in Ontology.get_properties ()) {
+ foreach (Property prop in Ontologies.get_properties ()) {
if (prop.range == range) {
if (first) {
first = false;
@@ -205,7 +205,7 @@ public class Tracker.SparqlQuery : Object {
} else if (domain != null) {
// any subject, predicates limited to a specific domain
bool first = true;
- foreach (Property prop in Ontology.get_properties ()) {
+ foreach (Property prop in Ontologies.get_properties ()) {
if (prop.domain == domain) {
if (first) {
first = false;
@@ -487,7 +487,7 @@ public class Tracker.SparqlQuery : Object {
// declare fn prefix for XPath functions
prefix_map.insert ("fn", FN_NS);
- foreach (Namespace ns in Ontology.get_namespaces ()) {
+ foreach (Namespace ns in Ontologies.get_namespaces ()) {
prefix_map.insert (ns.prefix, ns.uri);
}
@@ -520,7 +520,7 @@ public class Tracker.SparqlQuery : Object {
// declare fn prefix for XPath functions
prefix_map.insert ("fn", FN_NS);
- foreach (Namespace ns in Ontology.get_namespaces ()) {
+ foreach (Namespace ns in Ontologies.get_namespaces ()) {
prefix_map.insert (ns.prefix, ns.uri);
}
@@ -1604,7 +1604,7 @@ public class Tracker.SparqlQuery : Object {
return PropertyType.STRING;
} else {
// support properties as functions
- var prop = Ontology.get_property_by_uri (uri);
+ var prop = Ontologies.get_property_by_uri (uri);
if (prop == null) {
throw get_error ("Unknown function");
}
@@ -2495,7 +2495,7 @@ public class Tracker.SparqlQuery : Object {
} else {
return false;
}
- var prop = Ontology.get_property_by_uri (predicate);
+ var prop = Ontologies.get_property_by_uri (predicate);
if (prop == null) {
return false;
}
@@ -2890,13 +2890,13 @@ public class Tracker.SparqlQuery : Object {
Class subject_type = null;
if (!current_predicate_is_var) {
- prop = Ontology.get_property_by_uri (current_predicate);
+ prop = Ontologies.get_property_by_uri (current_predicate);
if (current_predicate == "http://www.w3.org/1999/02/22-rdf-syntax-ns#type";
&& !object_is_var) {
// rdf:type query
rdftype = true;
- var cl = Ontology.get_class_by_uri (object);
+ var cl = Ontologies.get_class_by_uri (object);
if (cl == null) {
throw new SparqlError.UNKNOWN_CLASS ("Unknown class `%s'".printf (object));
}
@@ -2916,7 +2916,7 @@ public class Tracker.SparqlQuery : Object {
&& current_subject_is_var
&& !object_is_var) {
// rdfs:domain
- var domain = Ontology.get_class_by_uri (object);
+ var domain = Ontologies.get_class_by_uri (object);
if (domain == null) {
throw new SparqlError.UNKNOWN_CLASS ("Unknown class `%s'".printf (object));
}
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index 8564e27..616c5d8 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -35,7 +35,7 @@
#include <libtracker-common/tracker-date-time.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-property.h>
#include <libtracker-common/tracker-utils.h>
@@ -1220,10 +1220,10 @@ db_recreate_all (void)
* we have cleaned up the ontology before we load all
* new databases.
*/
- tracker_ontology_shutdown ();
+ tracker_ontologies_shutdown ();
/* Make sure we initialize all other modules we depend on */
- tracker_ontology_init ();
+ tracker_ontologies_init ();
/* Now create the databases and close them */
g_message ("Creating database files, this may take a few moments...");
@@ -1438,7 +1438,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
db_recreate_all ();
/* Make sure we initialize all other modules we depend on */
- tracker_ontology_init ();
+ tracker_ontologies_init ();
/* Load databases */
g_message ("Loading databases files...");
@@ -1447,7 +1447,7 @@ tracker_db_manager_init (TrackerDBManagerFlags flags,
gboolean must_recreate;
/* Make sure we initialize all other modules we depend on */
- tracker_ontology_init ();
+ tracker_ontologies_init ();
/* Load databases */
g_message ("Loading databases files...");
@@ -1599,7 +1599,7 @@ tracker_db_manager_shutdown (void)
db_type_enum_class_pointer = NULL;
/* Make sure we shutdown all other modules we depend on */
- tracker_ontology_shutdown ();
+ tracker_ontologies_shutdown ();
initialized = FALSE;
locations_initialized = FALSE;
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 130e122..1880459 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -26,7 +26,7 @@
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
index f9d55ec..2b89649 100644
--- a/src/libtracker-fts/tracker-fts.c
+++ b/src/libtracker-fts/tracker-fts.c
@@ -4154,7 +4154,7 @@ static int fulltextNext(sqlite3_vtab_cursor *pCursor){
const gchar *uri;
int col = plrColumn (&plReader);
- uri = tracker_ontology_get_uri_by_id (col);
+ uri = tracker_ontologies_get_uri_by_id (col);
c->rank += get_metadata_weight (col);
if (uri && first_pos) {
diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
index 79d2c8f..842299f 100644
--- a/src/plugins/evolution/tracker-evolution-plugin.c
+++ b/src/plugins/evolution/tracker-evolution-plugin.c
@@ -75,7 +75,7 @@
#include <libtracker-client/tracker-sparql-builder.h>
#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-type-utils.h>
diff --git a/src/tracker-extract/tracker-extract-abw.c b/src/tracker-extract/tracker-extract-abw.c
index af3780e..6c0a0ba 100644
--- a/src/tracker-extract/tracker-extract-abw.c
+++ b/src/tracker-extract/tracker-extract-abw.c
@@ -34,7 +34,7 @@
#include <glib/gstdio.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-flac.c b/src/tracker-extract/tracker-extract-flac.c
index 95eff4b..840e209 100644
--- a/src/tracker-extract/tracker-extract-flac.c
+++ b/src/tracker-extract/tracker-extract-flac.c
@@ -28,7 +28,7 @@
#include <FLAC/metadata.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-gstreamer.c b/src/tracker-extract/tracker-extract-gstreamer.c
index 9b4e6db..e815dee 100644
--- a/src/tracker-extract/tracker-extract-gstreamer.c
+++ b/src/tracker-extract/tracker-extract-gstreamer.c
@@ -37,7 +37,7 @@ long long int llroundl(long double x);
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-html.c b/src/tracker-extract/tracker-extract-html.c
index 15d1d25..ad8150e 100644
--- a/src/tracker-extract/tracker-extract-html.c
+++ b/src/tracker-extract/tracker-extract-html.c
@@ -26,7 +26,7 @@
#include <libxml/HTMLparser.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index f835004..86659f0 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -42,7 +42,7 @@
#include <jpeglib.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-libxine.c b/src/tracker-extract/tracker-extract-libxine.c
index a04cc1c..31942b1 100644
--- a/src/tracker-extract/tracker-extract-libxine.c
+++ b/src/tracker-extract/tracker-extract-libxine.c
@@ -23,7 +23,7 @@
#include <glib.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-mp3.c b/src/tracker-extract/tracker-extract-mp3.c
index f1f16a2..2c78104 100644
--- a/src/tracker-extract/tracker-extract-mp3.c
+++ b/src/tracker-extract/tracker-extract-mp3.c
@@ -45,7 +45,7 @@
#include <libtracker-common/tracker-date-time.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-mplayer.c b/src/tracker-extract/tracker-extract-mplayer.c
index a73d815..73786ed 100644
--- a/src/tracker-extract/tracker-extract-mplayer.c
+++ b/src/tracker-extract/tracker-extract-mplayer.c
@@ -25,7 +25,7 @@
#include <glib.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-common/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-msoffice.c b/src/tracker-extract/tracker-extract-msoffice.c
index f970514..f9e828c 100644
--- a/src/tracker-extract/tracker-extract-msoffice.c
+++ b/src/tracker-extract/tracker-extract-msoffice.c
@@ -34,7 +34,7 @@
#include <gsf/gsf-utils.h>
#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-oasis.c b/src/tracker-extract/tracker-extract-oasis.c
index 3573620..62eadc7 100644
--- a/src/tracker-extract/tracker-extract-oasis.c
+++ b/src/tracker-extract/tracker-extract-oasis.c
@@ -24,7 +24,7 @@
#include <glib.h>
#include <libtracker-common/tracker-os-dependant.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
index 7dd825a..32490d1 100644
--- a/src/tracker-extract/tracker-extract-pdf.c
+++ b/src/tracker-extract/tracker-extract-pdf.c
@@ -26,7 +26,8 @@
#include <poppler.h>
#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
+#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-type-utils.h>
diff --git a/src/tracker-extract/tracker-extract-playlist.c b/src/tracker-extract/tracker-extract-playlist.c
index 175ad80..801e9d2 100644
--- a/src/tracker-extract/tracker-extract-playlist.c
+++ b/src/tracker-extract/tracker-extract-playlist.c
@@ -33,7 +33,7 @@
#include <totem-pl-parser.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 36c9347..643b90a 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -37,7 +37,7 @@
#include <glib/gstdio.h>
#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-ps.c b/src/tracker-extract/tracker-extract-ps.c
index 728c5e2..ed936f6 100644
--- a/src/tracker-extract/tracker-extract-ps.c
+++ b/src/tracker-extract/tracker-extract-ps.c
@@ -37,7 +37,7 @@
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-os-dependant.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-extract.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index 272e7a8..d385e12 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -32,7 +32,7 @@
#include <tiff.h>
#include <tiffio.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-extract-totem.c b/src/tracker-extract/tracker-extract-totem.c
index b004333..fa51702 100644
--- a/src/tracker-extract/tracker-extract-totem.c
+++ b/src/tracker-extract/tracker-extract-totem.c
@@ -23,7 +23,7 @@
#include <glib.h>
#include <libtracker-common/tracker-os-dependant.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-vorbis.c b/src/tracker-extract/tracker-extract-vorbis.c
index e1c71a3..4ab00cf 100644
--- a/src/tracker-extract/tracker-extract-vorbis.c
+++ b/src/tracker-extract/tracker-extract-vorbis.c
@@ -28,7 +28,7 @@
#include <vorbis/vorbisfile.h>
#include <libtracker-common/tracker-file-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-extract/tracker-extract.h>
diff --git a/src/tracker-extract/tracker-extract-xmp.c b/src/tracker-extract/tracker-extract-xmp.c
index 4da1651..c7f1949 100644
--- a/src/tracker-extract/tracker-extract-xmp.c
+++ b/src/tracker-extract/tracker-extract-xmp.c
@@ -22,7 +22,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-utils.h>
diff --git a/src/tracker-extract/tracker-topanalyzer.cpp b/src/tracker-extract/tracker-topanalyzer.cpp
index 1bf129e..331c836 100644
--- a/src/tracker-extract/tracker-topanalyzer.cpp
+++ b/src/tracker-extract/tracker-topanalyzer.cpp
@@ -40,7 +40,7 @@
#include <libtracker-common/tracker-type-utils.h>
#include <libtracker-common/tracker-os-dependant.h>
#include <libtracker-common/tracker-sparql-builder.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-extract/tracker-utils.h>
diff --git a/src/tracker-miner-fs/tracker-main.c b/src/tracker-miner-fs/tracker-main.c
index 83aea1e..db132e5 100644
--- a/src/tracker-miner-fs/tracker-main.c
+++ b/src/tracker-miner-fs/tracker-main.c
@@ -37,7 +37,7 @@
#include <libtracker-common/tracker-ioprio.h>
#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-miner/tracker-thumbnailer.h>
diff --git a/src/tracker-miner-fs/tracker-miner-applications.c b/src/tracker-miner-fs/tracker-miner-applications.c
index b8968c0..18198ea 100644
--- a/src/tracker-miner-fs/tracker-miner-applications.c
+++ b/src/tracker-miner-fs/tracker-miner-applications.c
@@ -20,7 +20,7 @@
#include "config.h"
#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include "tracker-miner-applications.h"
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index 5db9689..d886458 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -29,7 +29,7 @@
#include <glib/gstdio.h>
#include <libtracker-common/tracker-date-time.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-power.h>
#include <libtracker-common/tracker-storage.h>
#include <libtracker-common/tracker-type-utils.h>
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index 863939c..5bc9019 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -23,7 +23,7 @@
#include <libtracker-common/tracker-dbus.h>
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-dbus.h>
#include <libtracker-db/tracker-db-manager.h>
@@ -294,7 +294,7 @@ tracker_dbus_register_objects (void)
}
namespace_uri = g_strndup (rdf_class, hash - rdf_class + 1);
- namespace = tracker_ontology_get_namespace_by_uri (namespace_uri);
+ namespace = tracker_ontologies_get_namespace_by_uri (namespace_uri);
g_free (namespace_uri);
if (!namespace) {
diff --git a/src/tracker-store/tracker-events.c b/src/tracker-store/tracker-events.c
index 7c4cd9b..5dafc78 100644
--- a/src/tracker-store/tracker-events.c
+++ b/src/tracker-store/tracker-events.c
@@ -22,7 +22,7 @@
#include "config.h"
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include "tracker-events.h"
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index d4370b7..e8dbc2e 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -40,7 +40,7 @@
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-ioprio.h>
#include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-manager.h>
#include <libtracker-db/tracker-db-dbus.h>
diff --git a/src/tracker-store/tracker-resource-class.c b/src/tracker-store/tracker-resource-class.c
index ec58743..2b06844 100644
--- a/src/tracker-store/tracker-resource-class.c
+++ b/src/tracker-store/tracker-resource-class.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <libtracker-common/tracker-dbus.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-dbus.h>
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index e666001..c4c86fa 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -27,7 +27,7 @@
#include <libtracker-common/tracker-log.h>
#include <libtracker-common/tracker-utils.h>
#include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db-dbus.h>
diff --git a/src/tracker-store/tracker-statistics.c b/src/tracker-store/tracker-statistics.c
index 58fa1ff..6cf3ff5 100644
--- a/src/tracker-store/tracker-statistics.c
+++ b/src/tracker-store/tracker-statistics.c
@@ -143,7 +143,7 @@ cache_get_latest (void)
g_free,
NULL);
- classes = tracker_ontology_get_classes (&n_classes);
+ classes = tracker_ontologies_get_classes (&n_classes);
iface = tracker_db_manager_get_db_interface ();
@@ -218,7 +218,7 @@ tracker_statistics_get (TrackerStatistics *object,
values = g_ptr_array_new ();
- classes = tracker_ontology_get_classes (&n_classes);
+ classes = tracker_ontologies_get_classes (&n_classes);
for (i = 0; i < n_classes; i++) {
GStrv strv;
diff --git a/src/tracker-store/tracker-writeback.c b/src/tracker-store/tracker-writeback.c
index 736a243..4f47673 100644
--- a/src/tracker-store/tracker-writeback.c
+++ b/src/tracker-store/tracker-writeback.c
@@ -22,7 +22,7 @@
#include "config.h"
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include "tracker-writeback.h"
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index 8d80825..eae3d88 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -30,7 +30,7 @@
#include <glib-object.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-common/tracker-utils.h>
#include "tracker-writeback-file.h"
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index 777ae6e..0ae805d 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -24,7 +24,7 @@
#include <glib.h>
#include <gio/gio.h>
-#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-common/tracker-ontologies.h>
#include <libtracker-db/tracker-db.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
