aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mandocdb.c24
-rw-r--r--mansearch.c36
2 files changed, 30 insertions, 30 deletions
diff --git a/mandocdb.c b/mandocdb.c
index 8ad91953..5b05ef45 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -1,4 +1,4 @@
-/* $Id: mandocdb.c,v 1.136 2014/04/16 18:59:43 schwarze Exp $ */
+/* $Id: mandocdb.c,v 1.137 2014/04/16 21:36:18 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -100,7 +100,7 @@ struct inodev {
struct mpage {
struct inodev inodev; /* used for hashing routine */
- int64_t recno; /* id in mpages SQL table */
+ int64_t pageid; /* pageid in mpages SQL table */
enum form form; /* format from file content */
char *sec; /* section from file content */
char *arch; /* architecture from file content */
@@ -1099,7 +1099,7 @@ mpages_merge(struct mchars *mc, struct mparse *mp)
* to the target.
*/
- if (mpage_dest->recno)
+ if (mpage_dest->pageid)
dbadd_mlink(mlink);
if (NULL == mlink->next)
@@ -1892,7 +1892,7 @@ dbadd_mlink(const struct mlink *mlink)
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);
- SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->recno);
+ SQL_BIND_INT64(stmts[STMT_INSERT_LINK], i, mlink->mpage->pageid);
SQL_STEP(stmts[STMT_INSERT_LINK]);
sqlite3_reset(stmts[STMT_INSERT_LINK]);
}
@@ -1944,7 +1944,7 @@ dbadd(struct mpage *mpage, struct mchars *mc)
SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->desc);
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);
SQL_STEP(stmts[STMT_INSERT_PAGE]);
- mpage->recno = sqlite3_last_insert_rowid(db);
+ mpage->pageid = sqlite3_last_insert_rowid(db);
sqlite3_reset(stmts[STMT_INSERT_PAGE]);
while (NULL != mlink) {
@@ -1961,7 +1961,7 @@ dbadd(struct mpage *mpage, struct mchars *mc)
i = 1;
SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, key->mask);
SQL_BIND_TEXT(stmts[STMT_INSERT_NAME], i, key->rendered);
- SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mpage->recno);
+ SQL_BIND_INT64(stmts[STMT_INSERT_NAME], i, mpage->pageid);
SQL_STEP(stmts[STMT_INSERT_NAME]);
sqlite3_reset(stmts[STMT_INSERT_NAME]);
if (key->rendered != key->key)
@@ -1976,7 +1976,7 @@ dbadd(struct mpage *mpage, struct mchars *mc)
i = 1;
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask);
SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered);
- SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, mpage->recno);
+ SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, mpage->pageid);
SQL_STEP(stmts[STMT_INSERT_KEY]);
sqlite3_reset(stmts[STMT_INSERT_KEY]);
if (key->rendered != key->key)
@@ -2172,14 +2172,14 @@ create_tables:
sql = "CREATE TABLE \"mpages\" (\n"
" \"desc\" TEXT NOT NULL,\n"
" \"form\" INTEGER NOT NULL,\n"
- " \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"
+ " \"pageid\" 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) "
+ " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
"ON DELETE CASCADE\n"
");\n"
"CREATE INDEX mlinks_pageid_idx ON mlinks (pageid);\n"
@@ -2187,14 +2187,14 @@ create_tables:
"CREATE TABLE \"names\" (\n"
" \"bits\" INTEGER NOT NULL,\n"
" \"name\" TEXT NOT NULL,\n"
- " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
+ " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
"ON DELETE CASCADE\n"
");\n"
"\n"
"CREATE TABLE \"keys\" (\n"
" \"bits\" INTEGER NOT NULL,\n"
" \"key\" TEXT NOT NULL,\n"
- " \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "
+ " \"pageid\" INTEGER NOT NULL REFERENCES mpages(pageid) "
"ON DELETE CASCADE\n"
");\n"
"CREATE INDEX keys_pageid_idx ON keys (pageid);\n";
@@ -2207,7 +2207,7 @@ create_tables:
prepare_statements:
SQL_EXEC("PRAGMA foreign_keys = ON");
- sql = "DELETE FROM mpages WHERE id IN "
+ sql = "DELETE FROM mpages WHERE pageid IN "
"(SELECT pageid FROM mlinks WHERE "
"sec=? AND arch=? AND name=?)";
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);
diff --git a/mansearch.c b/mansearch.c
index 957c56ec..1854eeca 100644
--- a/mansearch.c
+++ b/mansearch.c
@@ -1,4 +1,4 @@
-/* $Id: mansearch.c,v 1.31 2014/04/16 00:33:47 schwarze Exp $ */
+/* $Id: mansearch.c,v 1.32 2014/04/16 21:36:18 schwarze Exp $ */
/*
* Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -74,7 +74,7 @@ struct expr {
};
struct match {
- uint64_t id; /* identifier in database */
+ uint64_t pageid; /* identifier in database */
char *desc; /* manual page description */
int form; /* 0 == catpage */
};
@@ -156,7 +156,7 @@ mansearch(const struct mansearch *search,
struct manpage **res, size_t *sz)
{
int fd, rc, c, indexbit;
- int64_t id;
+ int64_t pageid;
uint64_t outbit, iterbit;
char buf[PATH_MAX];
char *sql;
@@ -175,7 +175,7 @@ mansearch(const struct mansearch *search,
info.halloc = hash_halloc;
info.alloc = hash_alloc;
info.hfree = hash_free;
- info.key_offset = offsetof(struct match, id);
+ info.key_offset = offsetof(struct match, pageid);
*sz = cur = maxres = 0;
sql = NULL;
@@ -287,16 +287,16 @@ mansearch(const struct mansearch *search,
* distribution of buckets in the table.
*/
while (SQLITE_ROW == (c = sqlite3_step(s))) {
- id = sqlite3_column_int64(s, 2);
+ pageid = sqlite3_column_int64(s, 2);
idx = ohash_lookup_memory
- (&htab, (char *)&id,
- sizeof(uint64_t), (uint32_t)id);
+ (&htab, (char *)&pageid,
+ sizeof(uint64_t), (uint32_t)pageid);
if (NULL != ohash_find(&htab, idx))
continue;
mp = mandoc_calloc(1, sizeof(struct match));
- mp->id = id;
+ mp->pageid = pageid;
mp->form = sqlite3_column_int(s, 1);
if (TYPE_Nd == outbit)
mp->desc = mandoc_strdup(
@@ -332,11 +332,11 @@ mansearch(const struct mansearch *search,
}
mpage = *res + cur;
mpage->form = mp->form;
- buildnames(mpage, db, s, mp->id,
+ buildnames(mpage, db, s, mp->pageid,
paths->paths[i], mp->form);
mpage->output = TYPE_Nd & outbit ?
mp->desc : outbit ?
- buildoutput(db, s2, mp->id, outbit) : NULL;
+ buildoutput(db, s2, mp->pageid, outbit) : NULL;
free(mp);
cur++;
@@ -362,7 +362,7 @@ out:
static void
buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
- uint64_t id, const char *path, int form)
+ uint64_t pageid, const char *path, int form)
{
char *newnames, *prevsec, *prevarch;
const char *oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
@@ -373,7 +373,7 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
mpage->names = NULL;
prevsec = prevarch = NULL;
i = 1;
- SQL_BIND_INT64(db, s, i, id);
+ SQL_BIND_INT64(db, s, i, pageid);
while (SQLITE_ROW == (c = sqlite3_step(s))) {
/* Decide whether we already have some names. */
@@ -455,7 +455,7 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
}
static char *
-buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit)
+buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t pageid, uint64_t outbit)
{
char *output, *newoutput;
const char *oldoutput, *sep1, *data;
@@ -464,7 +464,7 @@ buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit)
output = NULL;
i = 1;
- SQL_BIND_INT64(db, s, i, id);
+ SQL_BIND_INT64(db, s, i, pageid);
SQL_BIND_INT64(db, s, i, outbit);
while (SQLITE_ROW == (c = sqlite3_step(s))) {
if (NULL == output) {
@@ -559,14 +559,14 @@ sql_statement(const struct expr *e)
: "desc MATCH ?")
: TYPE_Nm == e->bits
? (NULL == e->substr
- ? "id IN (SELECT pageid FROM names "
+ ? "pageid IN (SELECT pageid FROM names "
"WHERE name REGEXP ?)"
- : "id IN (SELECT pageid FROM names "
+ : "pageid IN (SELECT pageid FROM names "
"WHERE name MATCH ?)")
: (NULL == e->substr
- ? "id IN (SELECT pageid FROM keys "
+ ? "pageid IN (SELECT pageid FROM keys "
"WHERE key REGEXP ? AND bits & ?)"
- : "id IN (SELECT pageid FROM keys "
+ : "pageid IN (SELECT pageid FROM keys "
"WHERE key MATCH ? AND bits & ?)"), 1);
if (e->close)
sql_append(&sql, &sz, ")", e->close);
generated by cgit v1.2.3-56-ge451 (git 2.39.0) at 2024-06-30 23:00:48 +0000