diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-01-05 03:25:52 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2014-01-05 03:25:52 +0000 |
| commit | 8648816b0dfd2b5158223853ba228488c50d89b7 (patch) | |
| tree | 3f335adb3230d82c7c40a7b7238dd1c6aa71e81f | |
| parent | 796b79b2f66f673644d023a556461b3cffa729ab (diff) | |
Remove the obsolete sec and arch columns from the mpages table.
They were confusing because a manpage can have MLINKS in different
sections and architectures.
| -rw-r--r-- | usr.bin/mandoc/mandocdb.c | 12 | ||||
| -rw-r--r-- | usr.bin/mandoc/mansearch.c | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/usr.bin/mandoc/mandocdb.c b/usr.bin/mandoc/mandocdb.c index 9961e3ad73b..54df489710c 100644 --- a/usr.bin/mandoc/mandocdb.c +++ b/usr.bin/mandoc/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.55 2014/01/05 03:06:36 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.56 2014/01/05 03:25:51 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -1811,13 +1811,11 @@ dbindex(const struct mpage *mpage, struct mchars *mc) i = 1; /* - * XXX The following three lines are obsolete + * XXX The following line is obsolete * and only kept for backward compatibility * until apropos(1) and friends have caught up. */ SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->file); - SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->dsec); - SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->arch); 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]); @@ -1955,14 +1953,12 @@ dbopen(int real) } /* - * XXX The first three columns in table mpages are obsolete + * XXX The first column in table mpages is 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" " \"desc\" TEXT NOT NULL,\n" " \"form\" INTEGER NOT NULL,\n" " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" @@ -1999,7 +1995,7 @@ prepare_statements: 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 (?,?,?,?,?)"; + "(file,desc,form) VALUES (?,?,?)"; sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL); sql = "INSERT INTO mlinks " "(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)"; diff --git a/usr.bin/mandoc/mansearch.c b/usr.bin/mandoc/mansearch.c index 16fe73f7336..912d051ba8c 100644 --- a/usr.bin/mandoc/mansearch.c +++ b/usr.bin/mandoc/mansearch.c @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.6 2014/01/05 03:06:36 schwarze Exp $ */ +/* $Id: mansearch.c,v 1.7 2014/01/05 03:25:51 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -271,7 +271,7 @@ mansearch(const struct mansearch *search, * distribution of buckets in the table. */ while (SQLITE_ROW == (c = sqlite3_step(s))) { - id = sqlite3_column_int64(s, 5); + id = sqlite3_column_int64(s, 3); idx = ohash_lookup_memory (&htab, (char *)&id, sizeof(uint64_t), (uint32_t)id); @@ -284,8 +284,8 @@ mansearch(const struct mansearch *search, mp->file = mandoc_strdup ((char *)sqlite3_column_text(s, 0)); mp->desc = mandoc_strdup - ((char *)sqlite3_column_text(s, 3)); - mp->form = sqlite3_column_int(s, 4); + ((char *)sqlite3_column_text(s, 1)); + mp->form = sqlite3_column_int(s, 2); ohash_insert(&htab, idx, mp); } |