notmuch: use new function Database().create_query() for 'count'

diff --git a/notmuch b/notmuch
index e4e07bcffe16e208e72265822aadc0c2e7d3589b..92f68150f321b9bcf517785d6d2596def07711c7 100755 (executable)
--- a/notmuch
+++ b/notmuch
@@ -142,15 +142,13 @@ if __name__ == '__main__':
        print "Not implemented."
    #-------------------------------------
    elif sys.argv[1] == 'count':
-      db = Database()
       if len(sys.argv) == 2:
-         #no further search term
+         #no further search term, count all
          querystr=''
       else:
          #mangle arguments wrapping terms with spaces in quotes
          querystr = quote_query_line(sys.argv[2:])
-      logging.debug("count "+querystr)
-      print(Query(db,querystr).count_messages())
+      print(Database().create_query(querystr).count_messages())
       
    #-------------------------------------
    elif sys.argv[1] == 'tag':