version 1.95, 2014/01/02 22:19:41 |
version 1.99, 2014/01/05 03:25:51 |
|
|
}; |
}; |
|
|
struct str { |
struct str { |
char *utf8; /* key in UTF-8 form */ |
char *rendered; /* key in UTF-8 or ASCII form */ |
const struct mpage *mpage; /* if set, the owning parse */ |
const struct mpage *mpage; /* if set, the owning parse */ |
uint64_t mask; /* bitmask in sequence */ |
uint64_t mask; /* bitmask in sequence */ |
char key[]; /* the string itself */ |
char key[]; /* may contain escape sequences */ |
}; |
}; |
|
|
struct inodev { |
struct inodev { |
Line 165 static void putkeys(const struct mpage *, |
|
Line 165 static void putkeys(const struct mpage *, |
|
const char *, size_t, uint64_t); |
const char *, size_t, uint64_t); |
static void putmdockey(const struct mpage *, |
static void putmdockey(const struct mpage *, |
const struct mdoc_node *, uint64_t); |
const struct mdoc_node *, uint64_t); |
|
static void render_key(struct mchars *, struct str *); |
static void say(const char *, const char *, ...); |
static void say(const char *, const char *, ...); |
static int set_basedir(const char *); |
static int set_basedir(const char *); |
static int treescan(void); |
static int treescan(void); |
static size_t utf8(unsigned int, char [7]); |
static size_t utf8(unsigned int, char [7]); |
static void utf8key(struct mchars *, struct str *); |
|
|
|
static char *progname; |
static char *progname; |
static int use_all; /* use all found files */ |
static int use_all; /* use all found files */ |
Line 1024 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
Line 1024 mpages_merge(struct mchars *mc, struct mparse *mp, int |
|
mpage->title = |
mpage->title = |
mandoc_strdup(mpage->mlinks->name); |
mandoc_strdup(mpage->mlinks->name); |
} |
} |
|
putkey(mpage, mpage->sec, TYPE_sec); |
|
putkey(mpage, '\0' == *mpage->arch ? |
|
"any" : mpage->arch, TYPE_arch); |
|
|
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) |
for (mlink = mpage->mlinks; mlink; mlink = mlink->next) { |
|
if ('\0' != *mlink->dsec) |
|
putkey(mpage, mlink->dsec, TYPE_sec); |
|
if ('\0' != *mlink->fsec) |
|
putkey(mpage, mlink->fsec, TYPE_sec); |
|
putkey(mpage, '\0' == *mlink->arch ? |
|
"any" : mlink->arch, TYPE_arch); |
putkey(mpage, mlink->name, TYPE_Nm); |
putkey(mpage, mlink->name, TYPE_Nm); |
|
} |
|
|
if (warnings && !use_all) { |
if (warnings && !use_all) { |
match = 0; |
match = 0; |
Line 1662 utf8(unsigned int cp, char out[7]) |
|
Line 1672 utf8(unsigned int cp, char out[7]) |
|
} |
} |
|
|
/* |
/* |
* Store the UTF-8 version of a key, or alias the pointer if the key has |
* Store the rendered version of a key, or alias the pointer |
* no UTF-8 transcription marks in it. |
* if the key contains no escape sequences. |
*/ |
*/ |
static void |
static void |
utf8key(struct mchars *mc, struct str *key) |
render_key(struct mchars *mc, struct str *key) |
{ |
{ |
size_t sz, bsz, pos; |
size_t sz, bsz, pos; |
char utfbuf[7], res[5]; |
char utfbuf[7], res[5]; |
Line 1675 utf8key(struct mchars *mc, struct str *key) |
|
Line 1685 utf8key(struct mchars *mc, struct str *key) |
|
int len, u; |
int len, u; |
enum mandoc_esc esc; |
enum mandoc_esc esc; |
|
|
assert(NULL == key->utf8); |
assert(NULL == key->rendered); |
|
|
res[0] = '\\'; |
res[0] = '\\'; |
res[1] = '\t'; |
res[1] = '\t'; |
Line 1691 utf8key(struct mchars *mc, struct str *key) |
|
Line 1701 utf8key(struct mchars *mc, struct str *key) |
|
* pointer as ourselvse and get out of here. |
* pointer as ourselvse and get out of here. |
*/ |
*/ |
if (strcspn(val, res) == bsz) { |
if (strcspn(val, res) == bsz) { |
key->utf8 = key->key; |
key->rendered = key->key; |
return; |
return; |
} |
} |
|
|
Line 1770 utf8key(struct mchars *mc, struct str *key) |
|
Line 1780 utf8key(struct mchars *mc, struct str *key) |
|
} |
} |
|
|
buf[pos] = '\0'; |
buf[pos] = '\0'; |
key->utf8 = buf; |
key->rendered = buf; |
} |
} |
|
|
/* |
/* |
* Flush the current page's terms (and their bits) into the database. |
* Flush the current page's terms (and their bits) into the database. |
* Wrap the entire set of additions in a transaction to make sqlite be a |
* Wrap the entire set of additions in a transaction to make sqlite be a |
* little faster. |
* little faster. |
* Also, UTF-8-encode the description at the last possible moment. |
* Also, handle escape sequences at the last possible moment. |
*/ |
*/ |
static void |
static void |
dbindex(const struct mpage *mpage, struct mchars *mc) |
dbindex(const struct mpage *mpage, struct mchars *mc) |
Line 1800 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
Line 1810 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
key = ohash_find(&strings, |
key = ohash_find(&strings, |
ohash_qlookup(&strings, mpage->desc)); |
ohash_qlookup(&strings, mpage->desc)); |
assert(NULL != key); |
assert(NULL != key); |
if (NULL == key->utf8) |
if (NULL == key->rendered) |
utf8key(mc, key); |
render_key(mc, key); |
desc = key->utf8; |
desc = key->rendered; |
} |
} |
|
|
SQL_EXEC("BEGIN TRANSACTION"); |
SQL_EXEC("BEGIN TRANSACTION"); |
|
|
i = 1; |
i = 1; |
/* |
/* |
* XXX The following three lines are obsolete |
* XXX The following line is obsolete |
* and only kept for backward compatibility |
* and only kept for backward compatibility |
* until apropos(1) and friends have caught up. |
* 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->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_TEXT(stmts[STMT_INSERT_PAGE], i, desc); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
SQL_STEP(stmts[STMT_INSERT_PAGE]); |
Line 1836 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
Line 1844 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
for (key = ohash_first(&strings, &slot); NULL != key; |
for (key = ohash_first(&strings, &slot); NULL != key; |
key = ohash_next(&strings, &slot)) { |
key = ohash_next(&strings, &slot)) { |
assert(key->mpage == mpage); |
assert(key->mpage == mpage); |
if (NULL == key->utf8) |
if (NULL == key->rendered) |
utf8key(mc, key); |
render_key(mc, key); |
i = 1; |
i = 1; |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, key->mask); |
SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->utf8); |
SQL_BIND_TEXT(stmts[STMT_INSERT_KEY], i, key->rendered); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, recno); |
SQL_BIND_INT64(stmts[STMT_INSERT_KEY], i, recno); |
SQL_STEP(stmts[STMT_INSERT_KEY]); |
SQL_STEP(stmts[STMT_INSERT_KEY]); |
sqlite3_reset(stmts[STMT_INSERT_KEY]); |
sqlite3_reset(stmts[STMT_INSERT_KEY]); |
if (key->utf8 != key->key) |
if (key->rendered != key->key) |
free(key->utf8); |
free(key->rendered); |
free(key); |
free(key); |
} |
} |
|
|
Line 1953 dbopen(int real) |
|
Line 1961 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 |
* and only kept for backward compatibility |
* until apropos(1) and friends have caught up. |
* until apropos(1) and friends have caught up. |
*/ |
*/ |
sql = "CREATE TABLE \"mpages\" (\n" |
sql = "CREATE TABLE \"mpages\" (\n" |
" \"file\" TEXT NOT NULL,\n" |
" \"file\" TEXT NOT NULL,\n" |
" \"sec\" TEXT NOT NULL,\n" |
|
" \"arch\" TEXT NOT NULL,\n" |
|
" \"desc\" TEXT NOT NULL,\n" |
" \"desc\" TEXT NOT NULL,\n" |
" \"form\" INTEGER NOT NULL,\n" |
" \"form\" INTEGER NOT NULL,\n" |
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
" \"id\" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL\n" |
Line 1997 prepare_statements: |
|
Line 2003 prepare_statements: |
|
sql = "DELETE FROM mpages where file=?"; |
sql = "DELETE FROM mpages where file=?"; |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL); |
sql = "INSERT INTO mpages " |
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); |
sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL); |
sql = "INSERT INTO mlinks " |
sql = "INSERT INTO mlinks " |
"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)"; |
"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)"; |