Add an additional mlinks table to the database, redundant for now,

both because it contains nothing but a subset of the data of the
existing mpages table and because the relationship of mpage and mlink
entries is still 1:1.  But all that will eventually change.

2 files changed, 56 insertions, 25 deletions

diff --git a/mandocdb.c b/mandocdb.c
index d355f586..b74996b6 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.80 2013/12/26 23:35:59 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.81 2013/12/27 01:16:54 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -111,9 +111,10 @@ struct	title {
 };
 
 enum	stmt {
-	STMT_DELETE = 0, /* delete manpage */
-	STMT_INSERT_DOC, /* insert manpage */
-	STMT_INSERT_KEY, /* insert parsed key */
+	STMT_DELETE_PAGE = 0,	/* delete mpage */
+	STMT_INSERT_PAGE,	/* insert mpage */
+	STMT_INSERT_LINK,	/* insert mlink */
+	STMT_INSERT_KEY,	/* insert parsed key */
 	STMT__MAX
 };
 
@@ -1814,14 +1815,27 @@ dbindex(struct mchars *mc, int form, const struct mpage *mpage)
 	SQL_EXEC("BEGIN TRANSACTION");
 
 	i = 1;
-	SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->file);
-	SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->sec);
-	SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, mpage->arch);
-	SQL_BIND_TEXT(stmts[STMT_INSERT_DOC], i, desc);
-	SQL_BIND_INT(stmts[STMT_INSERT_DOC], i, form);
-	SQL_STEP(stmts[STMT_INSERT_DOC]);
+	/*
+	 * XXX The following three lines are obsolete
+	 * and only kept for backward compatibility
+	 * until apropos(1) and friends have caught up.
+	 */
+	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->file);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->sec);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->arch);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc);
+	SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, form);
+	SQL_STEP(stmts[STMT_INSERT_PAGE]);
 	recno = sqlite3_last_insert_rowid(db);
-	sqlite3_reset(stmts[STMT_INSERT_DOC]);
+	sqlite3_reset(stmts[STMT_INSERT_PAGE]);
+
+	i = 1;
+	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->sec);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->arch);
+	SQL_BIND_TEXT(stmts[STMT_INSERT_LINK], i, mpage->file);
+	SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, recno);
+	SQL_STEP(stmts[STMT_INSERT_LINK]);
+	sqlite3_reset(stmts[STMT_INSERT_LINK]);
 
 	for (key = ohash_first(&strings, &slot); NULL != key;
 	     key = ohash_next(&strings, &slot)) {
@@ -1855,9 +1869,9 @@ dbprune(void)
 	mpage = ohash_first(&mpages, &slot);
 	while (NULL != mpage) {
 		i = 1;
-		SQL_BIND_TEXT(stmts[STMT_DELETE], i, mpage->file);
-		SQL_STEP(stmts[STMT_DELETE]);
-		sqlite3_reset(stmts[STMT_DELETE]);
+		SQL_BIND_TEXT(stmts[STMT_DELETE_PAGE], i, mpage->file);
+		SQL_STEP(stmts[STMT_DELETE_PAGE]);
+		sqlite3_reset(stmts[STMT_DELETE_PAGE]);
 		if (verb)
 			say(mpage->file, "Deleted from index");
 		mpage = ohash_next(&mpages, &slot);
@@ -1940,7 +1954,12 @@ dbopen(int real)
 		return(0);
 	}
 
-	sql = "CREATE TABLE \"docs\" (\n"
+	/*
+	 * XXX The first three columns in table mpages are obsolete
+	 * and only kept for backward compatibility
+	 * until apropos(1) and friends have caught up.
+	 */
+	sql = "CREATE TABLE \"mpages\" (\n"
 	      " \"file\" TEXT NOT NULL,\n"
 	      " \"sec\" TEXT NOT NULL,\n"
 	      " \"arch\" TEXT NOT NULL,\n"
@@ -1949,11 +1968,20 @@ dbopen(int real)
 	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
 	      ");\n"
 	      "\n"
+	      "CREATE TABLE \"mlinks\" (\n"
+	      " \"sec\" TEXT NOT NULL,\n"
+	      " \"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"
+	      ");\n"
+	      "\n"
 	      "CREATE TABLE \"keys\" (\n"
 	      " \"bits\" INTEGER NOT NULL,\n"
 	      " \"key\" TEXT NOT NULL,\n"
-	      " \"docid\" INTEGER NOT NULL REFERENCES docs(id) "
-	      	"ON DELETE CASCADE,\n"
+	      " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
+		"ON DELETE CASCADE,\n"
 	      " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
 	      ");\n"
 	      "\n"
@@ -1967,13 +1995,16 @@ dbopen(int real)
 
 prepare_statements:
 	SQL_EXEC("PRAGMA foreign_keys = ON");
-	sql = "DELETE FROM docs where file=?";
-	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE], NULL);
-	sql = "INSERT INTO docs "
+	sql = "DELETE FROM mpages where file=?";
+	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
+	sql = "INSERT INTO mpages "
 		"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)";
-	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_DOC], NULL);
+	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);
+	sql = "INSERT INTO mlinks "
+		"(sec,arch,name,pageid) VALUES (?,?,?,?)";
+	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_LINK], NULL);
 	sql = "INSERT INTO keys "
-		"(bits,key,docid) VALUES (?,?,?)";
+		"(bits,key,pageid) VALUES (?,?,?)";
 	sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_KEY], NULL);
 
 #ifndef __APPLE__
diff --git a/mansearch.c b/mansearch.c
index e054e4dd..05d11293 100644
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.8 2013/10/20 00:03:05 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.9 2013/12/27 01:16:54 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -363,9 +363,9 @@ sql_statement(const struct expr *e, const char *arch, const char *sec)
 	size_t		 sz;
 
 	sql = mandoc_strdup
-		("SELECT docid,bits,key,file,desc,form,sec,arch "
+		("SELECT pageid,bits,key,file,desc,form,sec,arch "
 		 "FROM keys "
-		 "INNER JOIN docs ON docs.id=keys.docid "
+		 "INNER JOIN mpages ON mpages.id=keys.pageid "
 		 "WHERE ");
 	sz = strlen(sql);
 	substrsz = strlen(substr);