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

[mr svn gnome org]

Author: mr
Date: Tue Sep  9 10:28:19 2008
New Revision: 2206
URL: http://svn.gnome.org/viewvc/tracker?rev=2206&view=rev

Log:
	* src/libtracker-db/tracker-db-interface.c:
	* src/tracker-indexer/tracker-indexer-db.c: Some small code clean ups.

	* src/tracker-indexer/tracker-indexer.c: Better error handling for
	the move dbus function.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-db/tracker-db-interface.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
   branches/indexer-split/src/tracker-indexer/tracker-indexer.c

Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface.c	Tue Sep  9 10:28:19 2008
@@ -19,9 +19,10 @@
  */
 
 #include <string.h>
+
 #include <gobject/gvaluecollector.h>
-#include "tracker-db-interface.h"
 
+#include "tracker-db-interface.h"
 
 #define TRACKER_DB_RESULT_SET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_DB_RESULT_SET, TrackerDBResultSetPrivate))
 
@@ -44,18 +45,18 @@
 GQuark
 tracker_db_interface_error_quark (void)
 {
-  return g_quark_from_static_string ("tracker-db-interface-error-quark");
+	return g_quark_from_static_string ("tracker-db-interface-error-quark");
 }
 
 static void
 tracker_db_interface_class_init (gpointer iface)
 {
-  g_object_interface_install_property (iface,
-				       g_param_spec_boolean ("in-transaction",
-							     "In transaction",
-							     "Whether the connection has a transaction opened",
-							     FALSE,
-							     G_PARAM_READWRITE));
+	g_object_interface_install_property (iface,
+					     g_param_spec_boolean ("in-transaction",
+								   "In transaction",
+								   "Whether the connection has a transaction opened",
+								   FALSE,
+								   G_PARAM_READWRITE));
 }
 
 GType
@@ -202,7 +203,8 @@
 							    "Columns",
 							    "Resultset columns",
 							    0, G_MAXUINT, 0,
-							    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+							    G_PARAM_READWRITE | 
+							    G_PARAM_CONSTRUCT_ONLY));
 
 
 	g_type_class_add_private (object_class,
@@ -244,12 +246,16 @@
 	g_return_val_if_fail (query != NULL, NULL);
 
 	if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query) {
-		g_critical ("Database abstraction %s doesn't implement the method execute_vquery()", G_OBJECT_TYPE_NAME (interface));
+		g_critical ("Database abstraction %s doesn't implement "
+			    "the method execute_vquery()", 
+			    G_OBJECT_TYPE_NAME (interface));
 		return NULL;
 	}
 
 	str = g_strdup_vprintf (query, args);
-	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query (interface, error, str);
+	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_query (interface, 
+										error, 
+										str);
 	g_free (str);
 
 	return ensure_result_set_state (result_set);
@@ -267,7 +273,10 @@
 	va_list args;
 
 	va_start (args, query);
-	result_set = tracker_db_interface_execute_vquery (interface, error, query, args);
+	result_set = tracker_db_interface_execute_vquery (interface, 
+							  error, 
+							  query, 
+							  args);
 	va_end (args);
 
 	return result_set;
@@ -281,11 +290,14 @@
 	g_return_if_fail (procedure_table != NULL);
 
 	if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->set_procedure_table) {
-		g_critical ("Database abstraction %s doesn't implement the method set_procedure_table()", G_OBJECT_TYPE_NAME (interface));
+		g_critical ("Database abstraction %s doesn't implement "
+			    "the method set_procedure_table()",
+			    G_OBJECT_TYPE_NAME (interface));
 		return;
 	}
 
-	TRACKER_DB_INTERFACE_GET_IFACE (interface)->set_procedure_table (interface, procedure_table);
+	TRACKER_DB_INTERFACE_GET_IFACE (interface)->set_procedure_table (interface, 
+									 procedure_table);
 }
 
 TrackerDBResultSet *
@@ -300,11 +312,16 @@
 	g_return_val_if_fail (procedure != NULL, NULL);
 
 	if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure) {
-		g_critical ("Database abstraction %s doesn't implement the method execute_procedure()", G_OBJECT_TYPE_NAME (interface));
+		g_critical ("Database abstraction %s doesn't implement "
+			    "the method execute_procedure()", 
+			    G_OBJECT_TYPE_NAME (interface));
 		return NULL;
 	}
 
-	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure (interface, error, procedure, args);
+	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure (interface, 
+										    error, 
+										    procedure, 
+										    args);
 
 	return ensure_result_set_state (result_set);
 }
@@ -323,11 +340,16 @@
 	g_return_val_if_fail (procedure != NULL, NULL);
 
 	if (!TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure_len) {
-		g_critical ("Database abstraction %s doesn't implement the method execute_procedure_len()", G_OBJECT_TYPE_NAME (interface));
+		g_critical ("Database abstraction %s doesn't implement "
+			    "the method execute_procedure_len()", 
+			    G_OBJECT_TYPE_NAME (interface));
 		return NULL;
 	}
 
-	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure_len (interface, error, procedure, args);
+	result_set = TRACKER_DB_INTERFACE_GET_IFACE (interface)->execute_procedure_len (interface,
+											error, 
+											procedure, 
+											args);
 
 	return ensure_result_set_state (result_set);
 }
@@ -342,7 +364,10 @@
 	va_list args;
 
 	va_start (args, procedure);
-	result_set = tracker_db_interface_execute_vprocedure (interface, error, procedure, args);
+	result_set = tracker_db_interface_execute_vprocedure (interface, 
+							      error, 
+							      procedure, 
+							      args);
 	va_end (args);
 
 	return result_set;
@@ -358,7 +383,10 @@
 	va_list args;
 
 	va_start (args, procedure);
-	result_set = tracker_db_interface_execute_vprocedure_len (interface, error, procedure, args);
+	result_set = tracker_db_interface_execute_vprocedure_len (interface, 
+								  error, 
+								  procedure, 
+								  args);
 	va_end (args);
 
 	return result_set;
@@ -369,7 +397,9 @@
 {
 	GError *error = NULL;
 
-	tracker_db_interface_execute_query (interface, &error, "BEGIN TRANSACTION");
+	tracker_db_interface_execute_query (interface, 
+					    &error, 
+					    "BEGIN TRANSACTION");
 
 	if (error) {
 		g_warning (error->message);
@@ -378,6 +408,7 @@
 	}
 
 	g_object_set (interface, "in-transaction", TRUE, NULL);
+
 	return TRUE;
 }
 
@@ -389,8 +420,9 @@
 
 	g_object_get (interface, "in-transaction", &in_transaction, NULL);
 
-	if (!in_transaction)
+	if (!in_transaction) {
 		return FALSE;
+	}
 
 	g_object_set (interface, "in-transaction", FALSE, NULL);
 	tracker_db_interface_execute_query (interface, &error, "COMMIT");

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer-db.c	Tue Sep  9 10:28:19 2008
@@ -446,27 +446,41 @@
 {
 	TrackerDBInterface *iface;
 	GError *error = NULL;
-	gchar *from_dirname = NULL, *from_basename = NULL, *to_dirname = NULL, *to_basename = NULL;
+	gchar *from_dirname;
+	gchar *from_basename;
+	gchar *to_dirname;
+	gchar *to_basename;
 
 	iface = tracker_db_manager_get_db_interface_by_type (tracker_service_get_name (service),
 							     TRACKER_DB_CONTENT_TYPE_METADATA);
 
-	tracker_file_get_path_and_name (from, &from_dirname, &from_basename);
-	tracker_file_get_path_and_name (to, &to_dirname, &to_basename);
+	tracker_file_get_path_and_name (from, 
+					&from_dirname, 
+					&from_basename);
+	tracker_file_get_path_and_name (to, 
+					&to_dirname, 
+					&to_basename);
 
-	tracker_db_interface_execute_procedure (iface, NULL, "MoveService",
+	tracker_db_interface_execute_procedure (iface, 
+						NULL, 
+						"MoveService",
 						from_dirname, from_basename,
 						to_dirname, to_basename,
 						NULL);
 
 	/* FIXME: This procedure should use LIKE statement */
-	tracker_db_interface_execute_procedure (iface, &error, "MoveServiceChildren", from, to, from, NULL);
-
-	g_free (from_dirname);
-	g_free (from_basename);
+	tracker_db_interface_execute_procedure (iface,
+						&error, 
+						"MoveServiceChildren", 
+						from, 
+						to, 
+						from, 
+						NULL);
 
 	g_free (to_dirname);
 	g_free (to_basename);
+	g_free (from_dirname);
+	g_free (from_basename);
 }
 
 void

Modified: branches/indexer-split/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-indexer.c	Tue Sep  9 10:28:19 2008
@@ -2349,10 +2349,18 @@
 		g_free (service_type);
 
 		tracker_db_move_service (service, from, to);
-	}
 
-	dbus_g_method_return (context);
-	tracker_dbus_request_success (request_id);
+		dbus_g_method_return (context);
+		tracker_dbus_request_success (request_id);
+	} else {
+		tracker_dbus_request_failed (request_id,
+					     &actual_error,
+					     "Service type could not be found for file '%s' in module '%s'",
+					     service_type,
+					     module_name);
+		dbus_g_method_return_error (context, actual_error);
+		g_error_free (actual_error);
+	}
 
 	path_info_free (info);
 }