tracker r1613 - in branches/indexer-split: . src/libtracker-db src/trackerd

[ifrade svn gnome org]

Author: ifrade
Date: Mon Jun  9 17:05:24 2008
New Revision: 1613
URL: http://svn.gnome.org/viewvc/tracker?rev=1613&view=rev

Log:
Fixed get_registered metadata method

Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
   branches/indexer-split/src/libtracker-db/tracker-db-dbus.h
   branches/indexer-split/src/trackerd/tracker-files.c
   branches/indexer-split/src/trackerd/tracker-keywords.c
   branches/indexer-split/src/trackerd/tracker-metadata.c
   branches/indexer-split/src/trackerd/tracker-search.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-dbus.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-dbus.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-dbus.c	Mon Jun  9 17:05:24 2008
@@ -25,6 +25,7 @@
 
 gchar **
 tracker_dbus_query_result_to_strv (TrackerDBResultSet *result_set, 
+				   gint                column,
                                    gint               *count)
 {
 	gchar **strv = NULL;
@@ -38,7 +39,7 @@
 		strv = g_new (gchar*, rows + 1);
 		
 		while (valid) {
-			tracker_db_result_set_get (result_set, 0, &strv[i], -1);
+			tracker_db_result_set_get (result_set, column, &strv[i], -1);
 			valid = tracker_db_result_set_iter_next (result_set);
 			i++;
 		}

Modified: branches/indexer-split/src/libtracker-db/tracker-db-dbus.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-dbus.h	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-dbus.h	Mon Jun  9 17:05:24 2008
@@ -29,6 +29,7 @@
 #include "tracker-db-interface.h"
 
 gchar **    tracker_dbus_query_result_to_strv       (TrackerDBResultSet *result_set,
+						     gint                column,
 						     gint               *count);
 GHashTable *tracker_dbus_query_result_to_hash_table (TrackerDBResultSet *result_set);
 GPtrArray * tracker_dbus_query_result_to_ptr_array  (TrackerDBResultSet *result_set);

Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-files.c	Mon Jun  9 17:05:24 2008
@@ -585,7 +585,7 @@
 						      offset, 
 						      max_hits);
 
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 
 	if (result_set) {
 		g_object_unref (result_set);
@@ -634,7 +634,7 @@
 						   max_hits, 
 						   FALSE);
 
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 
 	if (result_set) {
 		g_object_unref (result_set);
@@ -686,7 +686,7 @@
 						   max_hits, 
 						   TRUE);
 
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 		
 	if (result_set) {
 		g_object_unref (result_set);

Modified: branches/indexer-split/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.c	Mon Jun  9 17:05:24 2008
@@ -202,7 +202,7 @@
 	result_set = tracker_db_metadata_get (iface, 
 					      id, 
 					      "User:Keywords");
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 
 	if (result_set) {
 		g_object_unref (result_set);
@@ -495,7 +495,7 @@
 	g_debug (query);
 
 	result_set = tracker_db_interface_execute_query (iface, NULL, query);
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 
 	if (result_set) {
 		g_object_unref (result_set);

Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c	Mon Jun  9 17:05:24 2008
@@ -185,7 +185,7 @@
 	g_debug (query);
 
 	result_set = tracker_db_interface_execute_query (iface, NULL, query);
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 	g_free (query);
 
 	if (result_set) {
@@ -425,11 +425,11 @@
 				  "class:'%s'",
 				  class);
 
-	iface = tracker_db_manager_get_db_interface (TRACKER_DB_FILE_METADATA);
+	iface = tracker_db_manager_get_db_interface (TRACKER_DB_COMMON);
 
-	result_set = tracker_db_metadata_get_types (iface, class, TRUE);
+	result_set = tracker_db_metadata_get_types (iface, class, FALSE);
 	if (result_set) {
-		*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+		*values = tracker_dbus_query_result_to_strv (result_set, 1, NULL);
 		g_object_unref (result_set);
 	}
 
@@ -466,7 +466,7 @@
 						    class_formatted, 
 						    TRUE);
 	if (result_set) {
-		*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+		*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 		g_object_unref (result_set);
 	}
 
@@ -500,7 +500,7 @@
 					   NULL);
 	
 	if (result_set) {
-		*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+		*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 		g_object_unref (result_set);
 	}
 

Modified: branches/indexer-split/src/trackerd/tracker-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-search.c	Mon Jun  9 17:05:24 2008
@@ -1090,7 +1090,7 @@
 	/* 					 text,  */
 	/* 					 offset,  */
 	/* 					 search_sanity_check_max_hits (max_hits)); */
-	*values = tracker_dbus_query_result_to_strv (result_set, NULL);
+	*values = tracker_dbus_query_result_to_strv (result_set, 0, NULL);
 
 	if (result_set) {
 		g_object_unref (result_set);