mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.108 and 1.111

version 1.108, 2014/01/18 08:19:18

version 1.111, 2014/01/19 00:09:38

Line 48

#include "manpath.h"

#include "mansearch.h"

extern int mansearch_keymax;

extern const char *const mansearch_keynames[];

#define SQL_EXEC(_v) \

if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \

fprintf(stderr, "%s\n", sqlite3_errmsg(db))

Line 1302 parse_man(struct mpage *mpage, const struct man_node *

Line 1305 parse_man(struct mpage *mpage, const struct man_node *

byte = start[sz];

start[sz] = '\0';

* Assume a stray trailing comma in the

* name list if a name begins with a dash.

if ('-' == start[0] ||

('\\' == start[0] && '-' == start[1]))

break;

putkey(mpage, start, TYPE_Nm);

if (' ' == byte) {

Line 1553 putkeys(const struct mpage *mpage,

Line 1565 putkeys(const struct mpage *mpage,

const char *cp, size_t sz, uint64_t v)

{

struct str *s;

unsigned int slot;

const char *end;

uint64_t mask;

unsigned int slot;

int i;

if (0 == sz)

return;

if (verb > 1) {

for (i = 0, mask = 1;

i < mansearch_keymax;

i++, mask <<= 1)

if (mask & v)

break;

say(mpage->mlinks->file, "Adding key %s=%*s",

mansearch_keynames[i], sz, cp);

}

end = cp + sz;

slot = ohash_qlookupi(&strings, cp, &end);

s = ohash_find(&strings, slot);

Line 1914 dbopen(int real)

Line 1938 dbopen(int real)

" \"arch\" TEXT NOT NULL,\n"

" \"name\" TEXT NOT NULL,\n"

" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "

"ON DELETE CASCADE,\n"

"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"

" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) "

"ON DELETE CASCADE,\n"

"ON DELETE CASCADE\n"

" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n"

");\n";

if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) {

CVSweb