mandoc/mandocdb.c - diff

Return to mandocdb.c CVS log

Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/mandocdb.c between version 1.96 and 1.100

version 1.96, 2014/01/02 22:44:10

version 1.100, 2014/01/05 04:13:52

Line 1024 mpages_merge(struct mchars *mc, struct mparse *mp, int

mpage->title =

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);

}

if (warnings && !use_all) {

match = 0;

Line 1808 dbindex(const struct mpage *mpage, struct mchars *mc)

Line 1818 dbindex(const struct mpage *mpage, struct mchars *mc)

SQL_EXEC("BEGIN TRANSACTION");

i = 1;

* XXX The following three lines are obsolete

* and only kept for backward compatibility

* 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->dsec);

SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, mpage->mlinks->arch);

SQL_BIND_TEXT(stmts[STMT_INSERT_PAGE], i, desc);

SQL_BIND_INT(stmts[STMT_INSERT_PAGE], i, FORM_SRC == mpage->form);

SQL_STEP(stmts[STMT_INSERT_PAGE]);

Line 1952 dbopen(int real)

Line 1954 dbopen(int real)

return(0);

}

* XXX The first three columns in table mpages are obsolete

* and only kept for backward compatibility

* until apropos(1) and friends have caught up.

sql = "CREATE TABLE \"mpages\" (\n"

" \"file\" TEXT NOT NULL,\n"

" \"sec\" TEXT NOT NULL,\n"

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

" \"desc\" TEXT NOT NULL,\n"

" \"form\" INTEGER NOT NULL,\n"

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

Line 1997 prepare_statements:

Line 1991 prepare_statements:

sql = "DELETE FROM mpages where file=?";

sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_DELETE_PAGE], NULL);

sql = "INSERT INTO mpages "

"(file,sec,arch,desc,form) VALUES (?,?,?,?,?)";

"(desc,form) VALUES (?,?)";

sqlite3_prepare_v2(db, sql, -1, &stmts[STMT_INSERT_PAGE], NULL);

sql = "INSERT INTO mlinks "

"(file,sec,arch,name,pageid) VALUES (?,?,?,?,?)";

CVSweb