[tracker] libtracker-data: Separate inserting URIs from creating DB schema

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

commit 137ee51087e22149b2cce8c03f4d6ca67dbda443
Author: Jürg Billeter <j bitron ch>
Date:   Thu Jan 7 11:57:02 2010 +0100

    libtracker-data: Separate inserting URIs from creating DB schema

 src/libtracker-data/tracker-data-manager.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index ac3ebac..caa95e6 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -662,8 +662,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
 
 static void
 create_decomposed_metadata_tables (TrackerDBInterface *iface,
-                                   TrackerClass       *service,
-                                   gint               *max_id)
+                                   TrackerClass       *service)
 {
 	const char *service_name;
 	GString    *sql;
@@ -741,12 +740,6 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
 		}
 	}
 
-	/* insert class uri in rdfs:Resource table */
-	if (tracker_class_get_uri (service) != NULL) {
-		insert_uri_in_resource_table (iface, tracker_class_get_uri (service),
-		                              max_id);
-	}
-
 	g_slist_free (class_properties);
 
 }
@@ -889,7 +882,13 @@ tracker_data_manager_init (TrackerDBManagerFlags  flags,
 
 		/* create tables */
 		for (i = 0; i < n_classes; i++) {
-			create_decomposed_metadata_tables (iface, classes[i], &max_id);
+			create_decomposed_metadata_tables (iface, classes[i]);
+		}
+
+		/* insert classes into rdfs:Resource table */
+		for (i = 0; i < n_classes; i++) {
+			insert_uri_in_resource_table (iface, tracker_class_get_uri (classes[i]),
+				                      &max_id);
 		}
 
 		/* insert properties into rdfs:Resource table */