version 1.134, 2014/04/13 20:55:45 |
version 1.136, 2014/04/16 18:59:43 |
Line 1154 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
Line 1154 mpages_merge(struct mchars *mc, struct mparse *mp) |
|
putkey(mpage, mlink->name, NAME_FILE); |
putkey(mpage, mlink->name, NAME_FILE); |
} |
} |
|
|
|
assert(NULL == mpage->desc); |
if (NULL != mdoc) { |
if (NULL != mdoc) { |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
if (NULL != (cp = mdoc_meta(mdoc)->name)) |
putkey(mpage, cp, NAME_HEAD); |
putkey(mpage, cp, NAME_HEAD); |
assert(NULL == mpage->desc); |
|
parse_mdoc(mpage, mdoc_node(mdoc)); |
parse_mdoc(mpage, mdoc_node(mdoc)); |
if (NULL == mpage->desc) |
|
mpage->desc = mandoc_strdup( |
|
mpage->mlinks->name); |
|
} else if (NULL != man) |
} else if (NULL != man) |
parse_man(mpage, man_node(man)); |
parse_man(mpage, man_node(man)); |
else |
else |
parse_cat(mpage, fd[0]); |
parse_cat(mpage, fd[0]); |
|
if (NULL == mpage->desc) |
|
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
|
|
if (warnings && !use_all) |
if (warnings && !use_all) |
for (mlink = mpage->mlinks; mlink; |
for (mlink = mpage->mlinks; mlink; |
Line 1302 parse_cat(struct mpage *mpage, int fd) |
|
Line 1301 parse_cat(struct mpage *mpage, int fd) |
|
if (warnings) |
if (warnings) |
say(mpage->mlinks->file, |
say(mpage->mlinks->file, |
"Cannot find NAME section"); |
"Cannot find NAME section"); |
assert(NULL == mpage->desc); |
|
mpage->desc = mandoc_strdup(mpage->mlinks->name); |
|
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
return; |
return; |
Line 1342 parse_cat(struct mpage *mpage, int fd) |
|
Line 1339 parse_cat(struct mpage *mpage, int fd) |
|
plen -= 2; |
plen -= 2; |
} |
} |
|
|
assert(NULL == mpage->desc); |
|
mpage->desc = mandoc_strdup(p); |
mpage->desc = mandoc_strdup(p); |
fclose(stream); |
fclose(stream); |
free(title); |
free(title); |
Line 1482 parse_man(struct mpage *mpage, const struct man_node * |
|
Line 1478 parse_man(struct mpage *mpage, const struct man_node * |
|
while (' ' == *start) |
while (' ' == *start) |
start++; |
start++; |
|
|
assert(NULL == mpage->desc); |
|
mpage->desc = mandoc_strdup(start); |
mpage->desc = mandoc_strdup(start); |
free(title); |
free(title); |
return; |
return; |
|
|
" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " |
" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " |
"ON DELETE CASCADE\n" |
"ON DELETE CASCADE\n" |
");\n" |
");\n" |
|
"CREATE INDEX mlinks_pageid_idx ON mlinks (pageid);\n" |
"\n" |
"\n" |
"CREATE TABLE \"names\" (\n" |
"CREATE TABLE \"names\" (\n" |
" \"bits\" INTEGER NOT NULL,\n" |
" \"bits\" INTEGER NOT NULL,\n" |
|
|
" \"key\" TEXT NOT NULL,\n" |
" \"key\" TEXT NOT NULL,\n" |
" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " |
" \"pageid\" INTEGER NOT NULL REFERENCES mpages(id) " |
"ON DELETE CASCADE\n" |
"ON DELETE CASCADE\n" |
");\n"; |
");\n" |
|
"CREATE INDEX keys_pageid_idx ON keys (pageid);\n"; |
|
|
if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) { |
if (SQLITE_OK != sqlite3_exec(db, sql, NULL, NULL, NULL)) { |
exitcode = (int)MANDOCLEVEL_SYSERR; |
exitcode = (int)MANDOCLEVEL_SYSERR; |