version 1.96, 2014/01/02 22:44:10 |
version 1.99, 2014/01/05 03:25:51 |
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 1809 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
Line 1819 dbindex(const struct mpage *mpage, struct mchars *mc) |
|
|
|
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 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 (?,?,?,?,?)"; |