tracker r2463 - in branches/libtracker-data: . src/libtracker-data src/trackerd

[juergbi svn gnome org]

Author: juergbi
Date: Thu Nov  6 10:14:38 2008
New Revision: 2463
URL: http://svn.gnome.org/viewvc/tracker?rev=2463&view=rev

Log:
2008-11-06  JÃrg Billeter  <j bitron ch>

	* src/libtracker-data/tracker-data-live-search.c:
	* src/libtracker-data/tracker-data-manager.c:
	* src/libtracker-data/tracker-data-manager.h:
	* src/libtracker-data/tracker-rdf-query.c:
	* src/libtracker-data/tracker-xesam-query.c:
	* src/trackerd/tracker-files.c:
	* src/trackerd/tracker-keywords.c:

	Revert unintentional renaming of tracker_db_metadata_get_field_*


Modified:
   branches/libtracker-data/ChangeLog
   branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c
   branches/libtracker-data/src/libtracker-data/tracker-data-manager.c
   branches/libtracker-data/src/libtracker-data/tracker-data-manager.h
   branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c
   branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c
   branches/libtracker-data/src/trackerd/tracker-files.c
   branches/libtracker-data/src/trackerd/tracker-keywords.c

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-live-search.c	Thu Nov  6 10:14:38 2008
@@ -390,7 +390,7 @@
 	for (l = fields; l; l = l->next) {
 		gchar *field_name;
 
-		field_name = tracker_data_query_metadata_field_related_names (iface,
+		field_name = tracker_db_metadata_get_field_related_names (iface,
 								    tracker_field_data_get_field_name (l->data));
 		g_string_append_printf (sql_join,
 					"INNER JOIN 'files-meta'.%s %s ON (X.ServiceID = %s.ServiceID AND %s.MetaDataID in (%s))\n ",

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-manager.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-manager.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-manager.c	Thu Nov  6 10:14:38 2008
@@ -252,7 +252,7 @@
 }
 
 gchar *
-tracker_data_query_metadata_field_related_names (TrackerDBInterface *iface,
+tracker_db_metadata_get_field_related_names (TrackerDBInterface *iface,
 				       const gchar	  *name)
 {
 	TrackerDBResultSet *result_set;
@@ -341,7 +341,7 @@
 }
 
 const gchar *
-tracker_data_query_metadata_field_table (TrackerFieldType type)
+tracker_db_metadata_get_field_table (TrackerFieldType type)
 {
 	switch (type) {
 	case TRACKER_FIELD_TYPE_INDEX:
@@ -404,7 +404,7 @@
 					   NULL);
 
 		alias = g_strdup_printf ("M%d", field_count);
-		table_name = tracker_data_query_metadata_field_table (tracker_field_get_data_type (def));
+		table_name = tracker_db_metadata_get_field_table (tracker_field_get_data_type (def));
 
 		g_debug ("Field_name: %s :table_name is: %s for data_type: %i",
 			 field_name,

Modified: branches/libtracker-data/src/libtracker-data/tracker-data-manager.h
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-data-manager.h	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-data-manager.h	Thu Nov  6 10:14:38 2008
@@ -64,9 +64,9 @@
 								  gint		       value);
 
 /* Metadata API */
-gchar *		    tracker_data_query_metadata_field_related_names	 (TrackerDBInterface  *iface,
+gchar *		    tracker_db_metadata_get_field_related_names	 (TrackerDBInterface  *iface,
 								  const gchar	      *name);
-const gchar *	    tracker_data_query_metadata_field_table		 (TrackerFieldType     type);
+const gchar *	    tracker_db_metadata_get_field_table		 (TrackerFieldType     type);
 
 /* Miscellaneous API */
 gchar *		    tracker_db_get_field_name			 (const gchar	      *service,

Modified: branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-rdf-query.c	Thu Nov  6 10:14:38 2008
@@ -1213,7 +1213,7 @@
 	if (!tracker_is_empty_string (keyword)) {
 		gchar *keyword_metadata;
 
-		keyword_metadata = tracker_data_query_metadata_field_related_names (iface,
+		keyword_metadata = tracker_db_metadata_get_field_related_names (iface,
 									  "DC:Keywords");
 		g_string_append_printf (data.sql_from,
 					"\n INNER JOIN ServiceKeywordMetaData K ON S.ID = K.ServiceID and K.MetaDataID in (%s) and K.MetaDataValue = '%s' ",
@@ -1338,7 +1338,7 @@
 			} else {
 				gchar *related_metadata;
 
-				related_metadata = tracker_data_query_metadata_field_related_names (iface,
+				related_metadata = tracker_db_metadata_get_field_related_names (iface,
 											  tracker_field_data_get_field_name (l->data));
 				g_string_append_printf (data.sql_from,
 							"\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",
@@ -1469,7 +1469,7 @@
 			} else {
 				gchar *related_metadata;
 
-				related_metadata = tracker_data_query_metadata_field_related_names (iface,
+				related_metadata = tracker_db_metadata_get_field_related_names (iface,
 											  tracker_field_data_get_field_name (l->data));
 				g_string_append_printf (data.sql_from,
 							"\n INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",

Modified: branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c
==============================================================================
--- branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c	(original)
+++ branches/libtracker-data/src/libtracker-data/tracker-xesam-query.c	Thu Nov  6 10:14:38 2008
@@ -1449,7 +1449,7 @@
 			} else {
 				gchar *related_metadata;
 
-				related_metadata = tracker_data_query_metadata_field_related_names (iface,
+				related_metadata = tracker_db_metadata_get_field_related_names (iface,
 											  tracker_field_data_get_field_name (l->data));
 				g_string_append_printf (data.sql_join,
 							" INNER JOIN %s %s ON (S.ID = %s.ServiceID and %s.MetaDataID in (%s)) ",

Modified: branches/libtracker-data/src/trackerd/tracker-files.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-files.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-files.c	Thu Nov  6 10:14:38 2008
@@ -819,7 +819,7 @@
 			continue;
 		}
 
-		table = tracker_data_query_metadata_field_table (tracker_field_get_data_type (defs[i]));
+		table = tracker_db_metadata_get_field_table (tracker_field_get_data_type (defs[i]));
 
 		g_string_append_printf (sql,
 					" LEFT OUTER JOIN %s M%d ON "

Modified: branches/libtracker-data/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/libtracker-data/src/trackerd/tracker-keywords.c	(original)
+++ branches/libtracker-data/src/trackerd/tracker-keywords.c	Thu Nov  6 10:14:38 2008
@@ -561,7 +561,7 @@
 				  "' || S.Name as EntityName from Services S, ServiceKeywordMetaData M ");
 
 	/* Create where string */
-	related_metadata = tracker_data_query_metadata_field_related_names (iface, "User:Keywords");
+	related_metadata = tracker_db_metadata_get_field_related_names (iface, "User:Keywords");
 
 	where = g_string_new ("");
 	g_string_append_printf (where,