[tracker/journal: 17/21] libtracker-data: Attempt at fixing journal replay, delete

[Jürg Billeter <juergbi src gnome org>]

commit a682ab2636db18ca81d736f3e14f2bdf3a93d5f1
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Mar 16 11:37:26 2010 +0100

    libtracker-data: Attempt at fixing journal replay, delete

 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 744c5e2..ba5e200 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2579,14 +2579,18 @@ 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) {
 
 				resource_buffer_switch (NULL, graph_id, NULL, subject_id);
 
 				if (property == rdf_type) {
-					cache_delete_resource_type (class, NULL, graph_id);
+					class = g_hash_table_lookup (classes, GINT_TO_POINTER (object_id));
+					if (class) {
+						cache_delete_resource_type (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;
 
@@ -2598,10 +2602,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);
 			}
 		}
 	}