===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.25
retrieving revision 1.27
diff -u -p -r1.25 -r1.27
--- mandoc/mansearch.c	2014/03/28 19:17:12	1.25
+++ mandoc/mansearch.c	2014/04/10 02:46:21	1.27
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.25 2014/03/28 19:17:12 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.27 2014/04/10 02:46:21 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -74,6 +74,7 @@ struct	expr {
 
 struct	match {
 	uint64_t	 id; /* identifier in database */
+	char		*desc; /* manual page description */
 	int		 form; /* 0 == catpage */
 };
 
@@ -220,7 +221,8 @@ mansearch(const struct mansearch *search,
 				SQL_BIND_BLOB(db, s, j, ep->regexp);
 			} else
 				SQL_BIND_TEXT(db, s, j, ep->substr);
-			SQL_BIND_INT64(db, s, j, ep->bits);
+			if (0 == ((TYPE_Nd | TYPE_Nm) & ep->bits))
+				SQL_BIND_INT64(db, s, j, ep->bits);
 		}
 
 		memset(&htab, 0, sizeof(struct ohash));
@@ -235,9 +237,9 @@ mansearch(const struct mansearch *search,
 		 * distribution of buckets in the table.
 		 */
 		while (SQLITE_ROW == (c = sqlite3_step(s))) {
-			id = sqlite3_column_int64(s, 1);
+			id = sqlite3_column_int64(s, 2);
 			idx = ohash_lookup_memory
-				(&htab, (char *)&id, 
+				(&htab, (char *)&id,
 				 sizeof(uint64_t), (uint32_t)id);
 
 			if (NULL != ohash_find(&htab, idx))
@@ -245,7 +247,10 @@ mansearch(const struct mansearch *search,
 
 			mp = mandoc_calloc(1, sizeof(struct match));
 			mp->id = id;
-			mp->form = sqlite3_column_int(s, 0);
+			mp->form = sqlite3_column_int(s, 1);
+			if (TYPE_Nd == outbit)
+				mp->desc = mandoc_strdup(
+				    sqlite3_column_text(s, 0));
 			ohash_insert(&htab, idx, mp);
 		}
 
@@ -279,7 +284,8 @@ mansearch(const struct mansearch *search,
 			mpage->form = mp->form;
 			buildnames(mpage, db, s, mp->id,
 			    paths->paths[i], mp->form);
-			mpage->output = outbit ?
+			mpage->output = TYPE_Nd & outbit ?
+			    mp->desc : outbit ?
 			    buildoutput(db, s2, mp->id, outbit) : NULL;
 
 			free(mp);
@@ -493,11 +499,22 @@ sql_statement(const struct expr *e)
 			sql_append(&sql, &sz, " OR ", 1);
 		if (e->open)
 			sql_append(&sql, &sz, "(", e->open);
-		sql_append(&sql, &sz, NULL == e->substr ?
-		    "id IN (SELECT pageid FROM keys "
-		    "WHERE key REGEXP ? AND bits & ?)" :
-		    "id IN (SELECT pageid FROM keys "
-		    "WHERE key MATCH ? AND bits & ?)", 1);
+		sql_append(&sql, &sz,
+		    TYPE_Nd & e->bits
+		    ? (NULL == e->substr
+			? "desc REGEXP ?"
+			: "desc MATCH ?")
+		    : TYPE_Nm == e->bits
+		    ? (NULL == e->substr
+			? "id IN (SELECT pageid FROM names "
+			  "WHERE name REGEXP ?)"
+			: "id IN (SELECT pageid FROM names "
+			  "WHERE name MATCH ?)")
+		    : (NULL == e->substr
+			? "id IN (SELECT pageid FROM keys "
+			  "WHERE key REGEXP ? AND bits & ?)"
+			: "id IN (SELECT pageid FROM keys "
+			  "WHERE key MATCH ? AND bits & ?)"), 1);
 		if (e->close)
 			sql_append(&sql, &sz, ")", e->close);
 		needop = 1;
@@ -514,8 +531,9 @@ sql_statement(const struct expr *e)
 static struct expr *
 exprcomp(const struct mansearch *search, int argc, char *argv[])
 {
+	uint64_t	 mask;
 	int		 i, toopen, logic, igncase, toclose;
-	struct expr	*first, *next, *cur;
+	struct expr	*first, *prev, *cur, *next;
 
 	first = cur = NULL;
 	logic = igncase = toclose = 0;
@@ -554,13 +572,35 @@ exprcomp(const struct mansearch *search, int argc, cha
 		next = exprterm(search, argv[i], !igncase);
 		if (NULL == next)
 			goto fail;
-		next->open = toopen;
-		next->and = (1 == logic);
-		if (NULL != first) {
+		if (NULL == first)
+			first = next;
+		else
 			cur->next = next;
-			cur = next;
-		} else
-			cur = first = next;
+		prev = cur = next;
+
+		/*
+		 * Searching for descriptions must be split out
+		 * because they are stored in the mpages table,
+		 * not in the keys table.
+		 */
+
+		for (mask = TYPE_Nm; mask <= TYPE_Nd; mask <<= 1) {
+			if (mask & cur->bits && ~mask & cur->bits) {
+				next = mandoc_calloc(1,
+				    sizeof(struct expr));
+				memcpy(next, cur, sizeof(struct expr));
+				prev->open = 1;
+				cur->bits = mask;
+				cur->next = next;
+				cur = next;
+				cur->bits &= ~mask;
+			}
+		}
+		prev->and = (1 == logic);
+		prev->open += toopen;
+		if (cur != prev)
+			cur->close = 1;
+
 		toopen = logic = igncase = 0;
 	}
 	if (toopen || logic || igncase || toclose)