tracker r1712 - in branches/xesam-support: . src/trackerd tests/scripts

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Jun 19 08:49:05 2008
New Revision: 1712
URL: http://svn.gnome.org/viewvc/tracker?rev=1712&view=rev

Log:
2008-06-19  Philip Van Hoof  <pvanhoof gnome org>

        * src/trackerd/tracker-xesam-query.c: Error reporting unsupported
        queries



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/trackerd/tracker-xesam-query.c
   branches/xesam-support/tests/scripts/dummy_data_start.sh.in
   branches/xesam-support/tests/scripts/dummy_data_stop.sh.in

Modified: branches/xesam-support/src/trackerd/tracker-xesam-query.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-xesam-query.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-xesam-query.c	Thu Jun 19 08:49:05 2008
@@ -50,6 +50,7 @@
 #define ELEMENT_XESAM_QUERY 	        "query"
 #define ELEMENT_XESAM_USER_QUERY        "userQuery"
 #define ELEMENT_XESAM_FIELD 		"field"
+#define ELEMENT_XESAM_REQUEST 		"request"
 
 /* Operators */
 #define ELEMENT_XESAM_AND 		"and"
@@ -843,6 +844,17 @@
 			return;
 		}
 		push_stack (data, STATE_BOOLEAN);
+	} else if (ELEMENT_IS (ELEMENT_XESAM_REQUEST)) {
+		/* Ignore */
+	} else {
+		g_warning ("%s not supported", element_name);
+
+		if (set_error_on_fail (FALSE, 
+				       context, 
+				       "Unsupported query", 
+				       error)) {
+			return;
+		}
 	}
 }
 

Modified: branches/xesam-support/tests/scripts/dummy_data_start.sh.in
==============================================================================
--- branches/xesam-support/tests/scripts/dummy_data_start.sh.in	(original)
+++ branches/xesam-support/tests/scripts/dummy_data_start.sh.in	Thu Jun 19 08:49:05 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SCRIPTS_DIR= top_srcdir@/tests/common/scripts
+SCRIPTS_DIR= top_srcdir@/tests/scripts
 SQLITE_EXEC= sqlite_exec@
 
 . $SCRIPTS_DIR/xdg_dirs.source

Modified: branches/xesam-support/tests/scripts/dummy_data_stop.sh.in
==============================================================================
--- branches/xesam-support/tests/scripts/dummy_data_stop.sh.in	(original)
+++ branches/xesam-support/tests/scripts/dummy_data_stop.sh.in	Thu Jun 19 08:49:05 2008
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-SCRIPTS_DIR= top_srcdir@/tests/common/scripts
+SCRIPTS_DIR= top_srcdir@/tests/scripts
 
 . $SCRIPTS_DIR/xdg_dirs.source