[tracker/property-changes-for-review] libtracker-data: Code style changes and some refactoring
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/property-changes-for-review] libtracker-data: Code style changes and some refactoring
- Date: Fri, 9 Apr 2010 10:39:44 +0000 (UTC)
commit d8dd85cbab93c91ae0f8c636de2ec5d22021a1a1
Author: Philip Van Hoof <philip codeminded be>
Date: Fri Apr 9 12:38:45 2010 +0200
libtracker-data: Code style changes and some refactoring
src/libtracker-data/tracker-class.c | 12 ++--
src/libtracker-data/tracker-class.h | 48 +++++++-------
src/libtracker-data/tracker-data-manager.c | 60 +++++++++--------
src/libtracker-data/tracker-property.c | 12 ++--
src/libtracker-data/tracker-property.h | 100 ++++++++++++++--------------
5 files changed, 117 insertions(+), 115 deletions(-)
---
diff --git a/src/libtracker-data/tracker-class.c b/src/libtracker-data/tracker-class.c
index 501dd9b..6ce736e 100644
--- a/src/libtracker-data/tracker-class.c
+++ b/src/libtracker-data/tracker-class.c
@@ -39,7 +39,7 @@ struct _TrackerClassPriv {
gint count;
gint id;
gboolean is_new;
- gboolean need_recreate;
+ gboolean db_schema_changed;
gboolean notify;
GArray *super_classes;
@@ -180,7 +180,7 @@ tracker_class_get_notify (TrackerClass *service)
}
gboolean
-tracker_class_get_need_recreate (TrackerClass *service)
+tracker_class_get_db_schema_changed (TrackerClass *service)
{
TrackerClassPriv *priv;
@@ -188,7 +188,7 @@ tracker_class_get_need_recreate (TrackerClass *service)
priv = GET_PRIV (service);
- return priv->need_recreate;
+ return priv->db_schema_changed;
}
void
@@ -301,8 +301,8 @@ tracker_class_set_notify (TrackerClass *service,
}
void
-tracker_class_set_need_recreate (TrackerClass *service,
- gboolean value)
+tracker_class_set_db_schema_changed (TrackerClass *service,
+ gboolean value)
{
TrackerClassPriv *priv;
@@ -310,5 +310,5 @@ tracker_class_set_need_recreate (TrackerClass *service,
priv = GET_PRIV (service);
- priv->need_recreate = value;
+ priv->db_schema_changed = value;
}
diff --git a/src/libtracker-data/tracker-class.h b/src/libtracker-data/tracker-class.h
index 509bddd..56715ac 100644
--- a/src/libtracker-data/tracker-class.h
+++ b/src/libtracker-data/tracker-class.h
@@ -47,32 +47,32 @@ struct _TrackerClassClass {
GObjectClass parent_class;
};
-GType tracker_class_get_type (void) G_GNUC_CONST;
-TrackerClass * tracker_class_new (void);
-const gchar * tracker_class_get_uri (TrackerClass *service);
-const gchar * tracker_class_get_name (TrackerClass *service);
-gint tracker_class_get_count (TrackerClass *service);
-gint tracker_class_get_id (TrackerClass *service);
-gboolean tracker_class_get_is_new (TrackerClass *service);
-gboolean tracker_class_get_need_recreate (TrackerClass *service);
-gboolean tracker_class_get_notify (TrackerClass *service);
+GType tracker_class_get_type (void) G_GNUC_CONST;
+TrackerClass * tracker_class_new (void);
+const gchar * tracker_class_get_uri (TrackerClass *service);
+const gchar * tracker_class_get_name (TrackerClass *service);
+gint tracker_class_get_count (TrackerClass *service);
+gint tracker_class_get_id (TrackerClass *service);
+gboolean tracker_class_get_is_new (TrackerClass *service);
+gboolean tracker_class_get_db_schema_changed (TrackerClass *service);
+gboolean tracker_class_get_notify (TrackerClass *service);
-TrackerClass **tracker_class_get_super_classes (TrackerClass *service);
+TrackerClass **tracker_class_get_super_classes (TrackerClass *service);
-void tracker_class_set_uri (TrackerClass *service,
- const gchar *value);
-void tracker_class_set_count (TrackerClass *service,
- gint value);
-void tracker_class_add_super_class (TrackerClass *self,
- TrackerClass *value);
-void tracker_class_set_id (TrackerClass *service,
- gint id);
-void tracker_class_set_is_new (TrackerClass *service,
- gboolean value);
-void tracker_class_set_need_recreate (TrackerClass *service,
- gboolean value);
-void tracker_class_set_notify (TrackerClass *service,
- gboolean value);
+void tracker_class_set_uri (TrackerClass *service,
+ const gchar *value);
+void tracker_class_set_count (TrackerClass *service,
+ gint value);
+void tracker_class_add_super_class (TrackerClass *self,
+ TrackerClass *value);
+void tracker_class_set_id (TrackerClass *service,
+ gint id);
+void tracker_class_set_is_new (TrackerClass *service,
+ gboolean value);
+void tracker_class_set_db_schema_changed (TrackerClass *service,
+ gboolean value);
+void tracker_class_set_notify (TrackerClass *service,
+ gboolean value);
G_END_DECLS
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 4234078..cdc9d1b 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -104,9 +104,9 @@ static Conversion allowed_range_conversions[] = {
static void
set_index_for_single_value_property (TrackerDBInterface *iface,
- const gchar *service_name,
- const gchar *field_name,
- gboolean enabled)
+ const gchar *service_name,
+ const gchar *field_name,
+ gboolean enabled)
{
if (enabled) {
tracker_db_interface_execute_query (iface, NULL,
@@ -125,9 +125,9 @@ set_index_for_single_value_property (TrackerDBInterface *iface,
static void
set_index_for_multi_value_property (TrackerDBInterface *iface,
- const gchar *service_name,
- const gchar *field_name,
- gboolean enabled)
+ const gchar *service_name,
+ const gchar *field_name,
+ gboolean enabled)
{
tracker_db_interface_execute_query (iface, NULL,
"DROP INDEX IF EXISTS \"%s_%s_ID_ID\"",
@@ -166,7 +166,7 @@ set_index_for_multi_value_property (TrackerDBInterface *iface,
static gboolean
is_allowed_conversion (const gchar *oldv,
const gchar *newv,
- Conversion allowed[])
+ Conversion allowed[])
{
guint i;
@@ -182,12 +182,12 @@ is_allowed_conversion (const gchar *oldv,
}
static gboolean
-update_property_value (const gchar *kind,
- const gchar *subject,
- const gchar *predicate,
- const gchar *object,
- Conversion allowed[],
- TrackerClass *class,
+update_property_value (const gchar *kind,
+ const gchar *subject,
+ const gchar *predicate,
+ const gchar *object,
+ Conversion allowed[],
+ TrackerClass *class,
TrackerProperty *property)
{
GError *error = NULL;
@@ -294,7 +294,7 @@ check_range_conversion_is_allowed (const gchar *subject,
}
static void
-fix_indexed (TrackerProperty *property, gboolean enabled)
+fix_indexed (TrackerProperty *property)
{
TrackerDBInterface *iface;
TrackerClass *class;
@@ -308,9 +308,11 @@ fix_indexed (TrackerProperty *property, gboolean enabled)
service_name = tracker_class_get_name (class);
if (tracker_property_get_multiple_values (property)) {
- set_index_for_multi_value_property (iface, service_name, field_name, enabled);
+ set_index_for_multi_value_property (iface, service_name, field_name,
+ tracker_property_get_indexed (property));
} else {
- set_index_for_single_value_property (iface, service_name, field_name, enabled);
+ set_index_for_single_value_property (iface, service_name, field_name,
+ tracker_property_get_indexed (property));
}
}
@@ -724,7 +726,7 @@ tracker_data_ontology_process_changes (GPtrArray *seen_classes,
TRACKER_PREFIX "indexed",
"true", allowed_boolean_conversions,
NULL, property)) {
- fix_indexed (property, TRUE);
+ fix_indexed (property);
}
} else {
if (update_property_value ("tracker:indexed",
@@ -732,7 +734,7 @@ tracker_data_ontology_process_changes (GPtrArray *seen_classes,
TRACKER_PREFIX "indexed",
"false", allowed_boolean_conversions,
NULL, property)) {
- fix_indexed (property, FALSE);
+ fix_indexed (property);
}
}
@@ -743,8 +745,8 @@ tracker_data_ontology_process_changes (GPtrArray *seen_classes,
TrackerClass *class;
class = tracker_property_get_domain (property);
- tracker_class_set_need_recreate (class, TRUE);
- tracker_property_set_need_recreate (property, TRUE);
+ tracker_class_set_db_schema_changed (class, TRUE);
+ tracker_property_set_db_schema_changed (property, TRUE);
}
}
}
@@ -1234,7 +1236,7 @@ db_get_static_data (TrackerDBInterface *iface)
notify = FALSE;
}
- tracker_class_set_need_recreate (class, FALSE);
+ tracker_class_set_db_schema_changed (class, FALSE);
tracker_class_set_is_new (class, FALSE);
tracker_class_set_uri (class, uri);
tracker_class_set_notify (class, notify);
@@ -1386,7 +1388,7 @@ db_get_static_data (TrackerDBInterface *iface)
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_need_recreate (property, FALSE);
+ tracker_property_set_db_schema_changed (property, FALSE);
tracker_property_set_writeback (property, writeback);
tracker_property_set_fulltext_indexed (property, fulltext_indexed);
tracker_property_set_fulltext_no_limit (property, fulltext_no_limit);
@@ -1438,9 +1440,9 @@ insert_uri_in_resource_table (TrackerDBInterface *iface,
static void
range_change_for (TrackerProperty *property,
- GString *in_col_sql,
- GString *sel_col_sql,
- const gchar *field_name)
+ GString *in_col_sql,
+ GString *sel_col_sql,
+ const gchar *field_name)
{
/* TODO: TYPE_RESOURCE and TYPE_DATETIME are completely unhandled atm, we
* should forbid conversion from anything to resource or datetime in error
@@ -1517,7 +1519,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
}
if (!in_update || (in_update && (tracker_property_get_is_new (property) ||
- tracker_property_get_need_recreate (property)))) {
+ tracker_property_get_db_schema_changed (property)))) {
if (transient || tracker_property_get_multiple_values (property)) {
GString *sql;
GString *in_col_sql = NULL;
@@ -1912,12 +1914,12 @@ tracker_data_ontology_import_finished (void)
for (i = 0; i < n_classes; i++) {
tracker_class_set_is_new (classes[i], FALSE);
- tracker_class_set_need_recreate (classes[i], FALSE);
+ tracker_class_set_db_schema_changed (classes[i], FALSE);
}
for (i = 0; i < n_props; i++) {
tracker_property_set_is_new (properties[i], FALSE);
- tracker_property_set_need_recreate (properties[i], FALSE);
+ tracker_property_set_db_schema_changed (properties[i], FALSE);
}
}
@@ -1939,7 +1941,7 @@ tracker_data_ontology_import_into_db (gboolean in_update)
for (i = 0; i < n_classes; i++) {
/* Also !is_new classes are processed, they might have new properties */
create_decomposed_metadata_tables (iface, classes[i], in_update,
- tracker_class_get_need_recreate (classes[i]));
+ tracker_class_get_db_schema_changed (classes[i]));
}
/* insert classes into rdfs:Resource table */
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c
index cbe178e..135859e 100644
--- a/src/libtracker-data/tracker-property.c
+++ b/src/libtracker-data/tracker-property.c
@@ -59,7 +59,7 @@ struct _TrackerPropertyPriv {
gboolean transient;
gboolean is_inverse_functional_property;
gboolean is_new;
- gboolean need_recreate;
+ gboolean db_schema_changed;
gboolean writeback;
GArray *super_properties;
@@ -355,7 +355,7 @@ tracker_property_get_writeback (TrackerProperty *field)
}
gboolean
-tracker_property_get_need_recreate (TrackerProperty *field)
+tracker_property_get_db_schema_changed (TrackerProperty *field)
{
TrackerPropertyPriv *priv;
@@ -363,7 +363,7 @@ tracker_property_get_need_recreate (TrackerProperty *field)
priv = GET_PRIV (field);
- return priv->need_recreate;
+ return priv->db_schema_changed;
}
gboolean
@@ -590,8 +590,8 @@ tracker_property_set_writeback (TrackerProperty *field,
}
void
-tracker_property_set_need_recreate (TrackerProperty *field,
- gboolean value)
+tracker_property_set_db_schema_changed (TrackerProperty *field,
+ gboolean value)
{
TrackerPropertyPriv *priv;
@@ -599,7 +599,7 @@ tracker_property_set_need_recreate (TrackerProperty *field,
priv = GET_PRIV (field);
- priv->need_recreate = value;
+ priv->db_schema_changed = value;
}
void
diff --git a/src/libtracker-data/tracker-property.h b/src/libtracker-data/tracker-property.h
index 7eb4baa..ccfcbb1 100644
--- a/src/libtracker-data/tracker-property.h
+++ b/src/libtracker-data/tracker-property.h
@@ -70,61 +70,61 @@ struct _TrackerPropertyClass {
GObjectClass parent_class;
};
-GType tracker_property_get_type (void) G_GNUC_CONST;
-TrackerProperty * tracker_property_new (void);
-const gchar * tracker_property_get_uri (TrackerProperty *property);
-const gchar * tracker_property_get_name (TrackerProperty *property);
-const gchar * tracker_property_get_table_name (TrackerProperty *property);
-TrackerPropertyType tracker_property_get_data_type (TrackerProperty *property);
-TrackerClass * tracker_property_get_domain (TrackerProperty *property);
-TrackerClass * tracker_property_get_range (TrackerProperty *property);
-gint tracker_property_get_weight (TrackerProperty *property);
-gint tracker_property_get_id (TrackerProperty *property);
-gboolean tracker_property_get_indexed (TrackerProperty *property);
-gboolean tracker_property_get_fulltext_indexed (TrackerProperty *property);
-gboolean tracker_property_get_fulltext_no_limit(TrackerProperty *property);
-gboolean tracker_property_get_embedded (TrackerProperty *property);
-gboolean tracker_property_get_multiple_values (TrackerProperty *property);
-gboolean tracker_property_get_transient (TrackerProperty *property);
-gboolean tracker_property_get_is_new (TrackerProperty *property);
-gboolean tracker_property_get_writeback (TrackerProperty *property);
-gboolean tracker_property_get_need_recreate (TrackerProperty *property);
+GType tracker_property_get_type (void) G_GNUC_CONST;
+TrackerProperty * tracker_property_new (void);
+const gchar * tracker_property_get_uri (TrackerProperty *property);
+const gchar * tracker_property_get_name (TrackerProperty *property);
+const gchar * tracker_property_get_table_name (TrackerProperty *property);
+TrackerPropertyType tracker_property_get_data_type (TrackerProperty *property);
+TrackerClass * tracker_property_get_domain (TrackerProperty *property);
+TrackerClass * tracker_property_get_range (TrackerProperty *property);
+gint tracker_property_get_weight (TrackerProperty *property);
+gint tracker_property_get_id (TrackerProperty *property);
+gboolean tracker_property_get_indexed (TrackerProperty *property);
+gboolean tracker_property_get_fulltext_indexed (TrackerProperty *property);
+gboolean tracker_property_get_fulltext_no_limit (TrackerProperty *property);
+gboolean tracker_property_get_embedded (TrackerProperty *property);
+gboolean tracker_property_get_multiple_values (TrackerProperty *property);
+gboolean tracker_property_get_transient (TrackerProperty *property);
+gboolean tracker_property_get_is_new (TrackerProperty *property);
+gboolean tracker_property_get_writeback (TrackerProperty *property);
+gboolean tracker_property_get_db_schema_changed (TrackerProperty *property);
gboolean tracker_property_get_is_inverse_functional_property
(TrackerProperty *property);
-TrackerProperty ** tracker_property_get_super_properties (TrackerProperty *property);
-void tracker_property_set_uri (TrackerProperty *property,
- const gchar *value);
-void tracker_property_set_domain (TrackerProperty *property,
- TrackerClass *value);
-void tracker_property_set_range (TrackerProperty *property,
- TrackerClass *range);
-void tracker_property_set_weight (TrackerProperty *property,
- gint value);
-void tracker_property_set_id (TrackerProperty *property,
- gint value);
-void tracker_property_set_indexed (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_fulltext_indexed (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_fulltext_no_limit(TrackerProperty *property,
- gboolean value);
-void tracker_property_set_embedded (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_multiple_values (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_transient (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_is_new (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_writeback (TrackerProperty *property,
- gboolean value);
-void tracker_property_set_need_recreate (TrackerProperty *property,
- gboolean value);
+TrackerProperty ** tracker_property_get_super_properties (TrackerProperty *property);
+void tracker_property_set_uri (TrackerProperty *property,
+ const gchar *value);
+void tracker_property_set_domain (TrackerProperty *property,
+ TrackerClass *value);
+void tracker_property_set_range (TrackerProperty *property,
+ TrackerClass *range);
+void tracker_property_set_weight (TrackerProperty *property,
+ gint value);
+void tracker_property_set_id (TrackerProperty *property,
+ gint value);
+void tracker_property_set_indexed (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_fulltext_indexed (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_fulltext_no_limit (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_embedded (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_multiple_values (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_transient (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_is_new (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_writeback (TrackerProperty *property,
+ gboolean value);
+void tracker_property_set_db_schema_changed (TrackerProperty *property,
+ gboolean value);
void tracker_property_set_is_inverse_functional_property
(TrackerProperty *property,
gboolean value);
-void tracker_property_add_super_property (TrackerProperty *property,
- TrackerProperty *value);
+void tracker_property_add_super_property (TrackerProperty *property,
+ TrackerProperty *value);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
