===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.101
retrieving revision 1.105
diff -u -p -r1.101 -r1.105
--- mandoc/mandocdb.c	2014/01/05 04:48:40	1.101
+++ mandoc/mandocdb.c	2014/01/06 13:54:17	1.105
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.101 2014/01/05 04:48:40 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 *);
@@ -167,8 +167,9 @@ static	int	 treescan(void);
 static	size_t	 utf8(unsigned int, char [7]);
 
 static	char		*progname;
-static	int	 	 use_all; /* use all found files */
 static	int		 nodb; /* no database changes */
+static	int		 quick; /* abort the parse early */
+static	int	 	 use_all; /* use all found files */
 static	int	  	 verb; /* print what we're doing */
 static	int	  	 warnings; /* warn about crap */
 static	int		 write_utf8; /* write UTF-8 output; else ASCII */
@@ -347,7 +348,7 @@ main(int argc, char *argv[])
 	path_arg = NULL;
 	op = OP_DEFAULT;
 
-	while (-1 != (ch = getopt(argc, argv, "aC:d:nT:tu:vW")))
+	while (-1 != (ch = getopt(argc, argv, "aC:d:nQT:tu:vW")))
 		switch (ch) {
 		case ('a'):
 			use_all = 1;
@@ -365,6 +366,9 @@ main(int argc, char *argv[])
 		case ('n'):
 			nodb = 1;
 			break;
+		case ('Q'):
+			quick = 1;
+			break;
 		case ('T'):
 			if (strcmp(optarg, "utf8")) {
 				fprintf(stderr, "-T%s: Unsupported "
@@ -404,7 +408,7 @@ main(int argc, char *argv[])
 
 	exitcode = (int)MANDOCLEVEL_OK;
 	mp = mparse_alloc(MPARSE_AUTO, 
-		MANDOCLEVEL_FATAL, NULL, NULL, NULL);
+		MANDOCLEVEL_FATAL, NULL, NULL, quick);
 	mc = mchars_alloc();
 
 	ohash_init(&mpages, 6, &mpages_info);
@@ -494,11 +498,11 @@ out:
 	ohash_delete(&mlinks);
 	return(exitcode);
 usage:
-	fprintf(stderr, "usage: %s [-anvW] [-C file] [-Tutf8]\n"
-			"       %s [-anvW] [-Tutf8] dir ...\n"
-			"       %s [-nvW] [-Tutf8] -d dir [file ...]\n"
+	fprintf(stderr, "usage: %s [-anQvW] [-C file] [-Tutf8]\n"
+			"       %s [-anQvW] [-Tutf8] dir ...\n"
+			"       %s [-nQvW] [-Tutf8] -d dir [file ...]\n"
 			"       %s [-nvW] -u dir [file ...]\n"
-			"       %s -t file ...\n",
+			"       %s [-Q] -t file ...\n",
 		       progname, progname, progname, 
 		       progname, progname);
 
@@ -1043,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);
 	}
@@ -1728,35 +1732,23 @@ 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;
-	const char	*desc;
 	int64_t		 recno;
 	size_t		 i;
 	unsigned int	 slot;
 
 	if (verb)
-		say(mpage->mlinks->file, "Adding to index");
+		say(mpage->mlinks->file, "Adding to database");
 
 	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);
@@ -1764,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);
@@ -1811,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);
 	}
 }
@@ -1893,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"
@@ -1929,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 (?,?,?)";