===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.107
retrieving revision 1.111
diff -u -p -r1.107 -r1.111
--- mandoc/mandocdb.c	2014/01/06 20:53:40	1.107
+++ mandoc/mandocdb.c	2014/01/19 00:09:38	1.111
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.107 2014/01/06 20:53:40 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.111 2014/01/19 00:09:38 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -48,6 +48,9 @@
 #include "manpath.h"
 #include "mansearch.h"
 
+extern int mansearch_keymax;
+extern const char *const mansearch_keynames[];
+
 #define	SQL_EXEC(_v) \
 	if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \
 		fprintf(stderr, "%s\n", sqlite3_errmsg(db))
@@ -1302,6 +1305,15 @@ parse_man(struct mpage *mpage, const struct man_node *
 				byte = start[sz];
 				start[sz] = '\0';
 
+				/*
+				 * Assume a stray trailing comma in the
+				 * name list if a name begins with a dash.
+				 */
+
+				if ('-' == start[0] ||
+				    ('\\' == start[0] && '-' == start[1]))
+					break;
+
 				putkey(mpage, start, TYPE_Nm);
 
 				if (' ' == byte) {
@@ -1553,12 +1565,24 @@ putkeys(const struct mpage *mpage,
 	const char *cp, size_t sz, uint64_t v)
 {
 	struct str	*s;
-	unsigned int	 slot;
 	const char	*end;
+	uint64_t	 mask;
+	unsigned int	 slot;
+	int		 i;
 
 	if (0 == sz)
 		return;
 
+	if (verb > 1) {
+		for (i = 0, mask = 1;
+		     i < mansearch_keymax;
+		     i++, mask <<= 1)
+			if (mask & v)
+				break;
+		say(mpage->mlinks->file, "Adding key %s=%*s",
+		    mansearch_keynames[i], sz, cp);
+	}
+
 	end = cp + sz;
 	slot = ohash_qlookupi(&strings, cp, &end);
 	s = ohash_find(&strings, slot);
@@ -1914,19 +1938,15 @@ dbopen(int real)
 	      " \"arch\" TEXT NOT NULL,\n"
 	      " \"name\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+		"ON DELETE CASCADE\n"
 	      ");\n"
 	      "\n"
 	      "CREATE TABLE \"keys\" (\n"
 	      " \"bits\" INTEGER NOT NULL,\n"
 	      " \"key\" TEXT NOT NULL,\n"
 	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
-		"ON DELETE CASCADE,\n"
-	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
-	      ");\n"
-	      "\n"
-	      "CREATE INDEX \"key_index\" ON keys (key);\n";
+		"ON DELETE CASCADE\n"
+	      ");\n";
 
 	if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {
 		exitcode = (int)MANDOCLEVEL_SYSERR;