===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.103
retrieving revision 1.105
diff -u -p -r1.103 -r1.105
--- mandoc/mandocdb.c	2014/01/06 03:02:46	1.103
+++ mandoc/mandocdb.c	2014/01/06 13:54:17	1.105
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.103 2014/01/06 03:02:46 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.105 2014/01/06 13:54:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -130,7 +130,7 @@ struct	mdoc_handler {
 };
 
 static	void	 dbclose(int);
-static	void	 dbindex(const struct mpage *, struct mchars *);
+static	void	 dbadd(const struct mpage *, struct mchars *);
 static	int	 dbopen(int);
 static	void	 dbprune(void);
 static	void	 filescan(const char *);
@@ -1047,7 +1047,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
 		else
 			parse_cat(mpage);
 
-		dbindex(mpage, mc);
+		dbadd(mpage, mc);
 		ohash_delete(&strings);
 		mpage = ohash_next(&mpages, &pslot);
 	}
@@ -1732,7 +1732,7 @@ render_key(struct mchars *mc, struct str *key)
  * Also, handle escape sequences at the last possible moment.
  */
 static void
-dbindex(const struct mpage *mpage, struct mchars *mc)
+dbadd(const struct mpage *mpage, struct mchars *mc)
 {
 	struct mlink	*mlink;
 	struct str	*key;
@@ -1741,7 +1741,7 @@ dbindex(const struct mpage *mpage, struct mchars *mc)
 	unsigned int	 slot;
 
 	if (verb)
-		say(mpage->mlinks->file, "Adding to index");
+		say(mpage->mlinks->file, "Adding to database");
 
 	if (nodb)
 		return;
@@ -1756,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);
@@ -1803,7 +1802,7 @@ dbprune(void)
 		SQL_STEP(stmts[STMT_DELETE_PAGE]);
 		sqlite3_reset(stmts[STMT_DELETE_PAGE]);
 		if (verb)
-			say(mlink->file, "Deleted from index");
+			say(mlink->file, "Deleted from database");
 		mpage = ohash_next(&mpages, &slot);
 	}
 }
@@ -1890,7 +1889,6 @@ dbopen(int real)
 	      ");\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"
@@ -1923,7 +1921,7 @@ prepare_statements:
 		"(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 (?,?,?)";