[tracker/journal] libtracker-data: Attempt to fix journal replay
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/journal] libtracker-data: Attempt to fix journal replay
- Date: Tue, 16 Mar 2010 10:23:47 +0000 (UTC)
commit b2c258e894fc86641ca52d87b8b9429d559813d8
Author: Jürg Billeter <j bitron ch>
Date: Tue Mar 16 11:23:08 2010 +0100
libtracker-data: Attempt to fix journal replay
src/libtracker-data/tracker-data-update.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 8679f86..1ce63db 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2544,16 +2544,20 @@ tracker_data_replay_journal (GHashTable *classes,
tracker_db_journal_reader_get_statement_id (&graph_id, &subject_id, &predicate_id, &object_id);
property = g_hash_table_lookup (properties, GINT_TO_POINTER (predicate_id));
- class = g_hash_table_lookup (classes, GINT_TO_POINTER (object_id));
- if (property && class) {
+ if (property) {
if (tracker_property_get_data_type (property) != TRACKER_PROPERTY_TYPE_RESOURCE) {
g_warning ("Journal replay error: 'property with ID %d does not account URIs'", predicate_id);
} else {
resource_buffer_switch (NULL, graph_id, NULL, subject_id);
if (property == rdf_type) {
- cache_create_service_decomposed (class, NULL, graph_id);
+ class = g_hash_table_lookup (classes, GINT_TO_POINTER (object_id));
+ if (class) {
+ cache_create_service_decomposed (class, NULL, graph_id);
+ } else {
+ g_warning ("Journal replay error: 'class with ID %d not found in the ontology'", object_id);
+ }
} else {
GError *new_error = NULL;
@@ -2568,10 +2572,7 @@ tracker_data_replay_journal (GHashTable *classes,
}
}
} else {
- if (!class)
- g_warning ("Journal replay error: 'class with ID %d not found in the ontology'", object_id);
- if (!property)
- g_warning ("Journal replay error: 'property with ID %d doesn't exist'", predicate_id);
+ g_warning ("Journal replay error: 'property with ID %d doesn't exist'", predicate_id);
}
} else if (type == TRACKER_DB_JOURNAL_DELETE_STATEMENT) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]