===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- mandoc/mansearch.c	2014/01/05 04:13:52	1.17
+++ mandoc/mansearch.c	2014/01/06 03:02:46	1.18
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.17 2014/01/05 04:13:52 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.18 2014/01/06 03:02:46 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -70,7 +70,6 @@ struct	expr {
 
 struct	match {
 	uint64_t	 id; /* identifier in database */
-	char		*desc; /* description of manpage */
 	int		 form; /* 0 == catpage */
 };
 
@@ -279,7 +278,7 @@ mansearch(const struct mansearch *search,
 		 * distribution of buckets in the table.
 		 */
 		while (SQLITE_ROW == (c = sqlite3_step(s))) {
-			id = sqlite3_column_int64(s, 2);
+			id = sqlite3_column_int64(s, 1);
 			idx = ohash_lookup_memory
 				(&htab, (char *)&id, 
 				 sizeof(uint64_t), (uint32_t)id);
@@ -289,9 +288,7 @@ mansearch(const struct mansearch *search,
 
 			mp = mandoc_calloc(1, sizeof(struct match));
 			mp->id = id;
-			mp->desc = mandoc_strdup
-				((char *)sqlite3_column_text(s, 0));
-			mp->form = sqlite3_column_int(s, 1);
+			mp->form = sqlite3_column_int(s, 0);
 			ohash_insert(&htab, idx, mp);
 		}
 
@@ -321,7 +318,6 @@ mansearch(const struct mansearch *search,
 					(*res, maxres * sizeof(struct manpage));
 			}
 			mpage = *res + cur;
-			mpage->desc = mp->desc;
 			mpage->form = mp->form;
 			buildnames(mpage, db, s, mp->id, paths->paths[i]);
 			mpage->output = outbit ?