From: Carl Worth <cworth@cworth.org>
Date: Sun, 25 Oct 2009 05:18:20 +0000 (-0700)
Subject: Add debugging code for examining query strings.
X-Git-Tag: 0.1~729
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=526b7144f7d692e04ce950dfa7d0ee1bdf792cdc

Add debugging code for examining query strings.

It's nice that Xapian provides a little function to print a textual
representation of the entire query tree. So now, if you compile
like so:

	make CFLAGS=-DDEBUG_QUERY

then you get a nice output of the query string received by the query
module, and the final query actually being sent to Xapian.
---

diff --git a/Makefile b/Makefile
index 13f2b28d..1737a32e 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ MODULES=		\
 all: $(PROGS)
 
 %.o: %.cc
-	$(CXX) -c $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
+	$(CXX) -c $(CFLAGS) $(CXXFLAGS) $(MYCXXFLAGS) $< -o $@
 
 %.o: %.c
 	$(CC) -c $(CFLAGS) $(MYCFLAGS) $< -o $@
diff --git a/query.cc b/query.cc
index a15de966..f66ee556 100644
--- a/query.cc
+++ b/query.cc
@@ -41,6 +41,10 @@ notmuch_query_create (notmuch_database_t *notmuch,
 {
     notmuch_query_t *query;
 
+#ifdef DEBUG_QUERY
+    fprintf (stderr, "Query string is:\n%s\n", query_string);
+#endif
+
     query = talloc (NULL, notmuch_query_t);
     if (unlikely (query == NULL))
 	return NULL;
@@ -118,6 +122,10 @@ notmuch_query_search (notmuch_query_t *query)
 	    break;
 	}
 
+#if DEBUG_QUERY
+	fprintf (stderr, "Final query is:\n%s\n", final_query.get_description().c_str());
+#endif
+
 	enquire.set_query (final_query);
 
 	mset = enquire.get_mset (0, notmuch->xapian_db->get_doccount ());