===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.102
retrieving revision 1.104
diff -u -p -r1.102 -r1.104
--- mandoc/mandocdb.c	2014/01/05 20:26:36	1.102
+++ mandoc/mandocdb.c	2014/01/06 03:52:13	1.104
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.102 2014/01/05 20:26:36 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.104 2014/01/06 03:52:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -1736,7 +1736,6 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 {
 	struct mlink	*mlink;
 	struct str	*key;
-	const char	*desc;
 	int64_t		 recno;
 	size_t		 i;
 	unsigned int	 slot;
@@ -1747,20 +1746,9 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 	if (nodb)
 		return;
 
-	desc = "";
-	if (NULL != mpage->desc && '\0' != *mpage->desc) {
-		key = ohash_find(&strings,
-			ohash_qlookup(&strings, mpage->desc));
-		assert(NULL != key);
-		if (NULL == key->rendered)
-			render_key(mc, key);
-		desc = key->rendered;
-	}
-
 	SQL_EXEC("BEGIN TRANSACTION");
 
 	i = 1;
-	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc);
 	SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
 	SQL_STEP(stmts[STMT_INSERT_PAGE]);
 	recno = sqlite3_last_insert_rowid(db);
@@ -1768,7 +1756,6 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 
 	for (mlink = mpage->mlinks; mlink; mlink = mlink->next) {
 		i = 1;
-		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->file);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->dsec);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->arch);
 		SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mlink->name);
@@ -1897,13 +1884,11 @@ dbopen(int real)
 	}
 
 	sql = "CREATE TABLE \"mpages\" (\n"
-	      " \"desc\" TEXT NOT NULL,\n"
 	      " \"form\" INTEGER NOT NULL,\n"
 	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
 	      ");\n"
 	      "\n"
 	      "CREATE TABLE \"mlinks\" (\n"
-	      " \"file\" TEXT NOT NULL,\n"
 	      " \"sec\" TEXT NOT NULL,\n"
 	      " \"arch\" TEXT NOT NULL,\n"
 	      " \"name\" TEXT NOT NULL,\n"
@@ -1933,10 +1918,10 @@ prepare_statements:
 	sql = "DELETE FROM mpages where file=?";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
 	sql = "INSERT INTO mpages "
-		"(desc,form) VALUES (?,?)";
+		"(form) VALUES (?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
 	sql = "INSERT INTO mlinks "
-		"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";
+		"(sec,arch,name,pageid) VALUES (?,?,?,?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
 	sql = "INSERT INTO keys "
 		"(bits,key,pageid) VALUES (?,?,?)";