version 1.133, 2014/04/10 02:46:21 |
version 1.134, 2014/04/13 20:55:45 |
Line 55 extern const char *const mansearch_keynames[]; |
|
Line 55 extern const char *const mansearch_keynames[]; |
|
|
|
#define SQL_EXEC(_v) \ |
#define SQL_EXEC(_v) \ |
if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \ |
if (SQLITE_OK != sqlite3_exec(db, (_v), NULL, NULL, NULL)) \ |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)) |
say("", "%s: %s", (_v), sqlite3_errmsg(db)) |
#define SQL_BIND_TEXT(_s, _i, _v) \ |
#define SQL_BIND_TEXT(_s, _i, _v) \ |
if (SQLITE_OK != sqlite3_bind_text \ |
if (SQLITE_OK != sqlite3_bind_text \ |
((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \ |
((_s), (_i)++, (_v), -1, SQLITE_STATIC)) \ |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)) |
say(mlink->file, "%s", sqlite3_errmsg(db)) |
#define SQL_BIND_INT(_s, _i, _v) \ |
#define SQL_BIND_INT(_s, _i, _v) \ |
if (SQLITE_OK != sqlite3_bind_int \ |
if (SQLITE_OK != sqlite3_bind_int \ |
((_s), (_i)++, (_v))) \ |
((_s), (_i)++, (_v))) \ |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)) |
say(mlink->file, "%s", sqlite3_errmsg(db)) |
#define SQL_BIND_INT64(_s, _i, _v) \ |
#define SQL_BIND_INT64(_s, _i, _v) \ |
if (SQLITE_OK != sqlite3_bind_int64 \ |
if (SQLITE_OK != sqlite3_bind_int64 \ |
((_s), (_i)++, (_v))) \ |
((_s), (_i)++, (_v))) \ |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)) |
say(mlink->file, "%s", sqlite3_errmsg(db)) |
#define SQL_STEP(_s) \ |
#define SQL_STEP(_s) \ |
if (SQLITE_DONE != sqlite3_step((_s))) \ |
if (SQLITE_DONE != sqlite3_step((_s))) \ |
fprintf(stderr, "%s\n", sqlite3_errmsg(db)) |
say(mlink->file, "%s", sqlite3_errmsg(db)) |
|
|
enum op { |
enum op { |
OP_DEFAULT = 0, /* new dbs from dir list or default config */ |
OP_DEFAULT = 0, /* new dbs from dir list or default config */ |
Line 1205 names_check(void) |
|
Line 1205 names_check(void) |
|
{ |
{ |
sqlite3_stmt *stmt; |
sqlite3_stmt *stmt; |
const char *name, *sec, *arch, *key; |
const char *name, *sec, *arch, *key; |
size_t i; |
|
int irc; |
int irc; |
|
|
sqlite3_prepare_v2(db, |
sqlite3_prepare_v2(db, |
Line 1221 names_check(void) |
|
Line 1220 names_check(void) |
|
") USING (pageid);", |
") USING (pageid);", |
-1, &stmt, NULL); |
-1, &stmt, NULL); |
|
|
i = 1; |
if (SQLITE_OK != sqlite3_bind_int64(stmt, 1, NAME_TITLE)) |
SQL_BIND_INT64(stmt, i, NAME_TITLE); |
say("", "%s", sqlite3_errmsg(db)); |
|
|
while (SQLITE_ROW == (irc = sqlite3_step(stmt))) { |
while (SQLITE_ROW == (irc = sqlite3_step(stmt))) { |
name = sqlite3_column_text(stmt, 0); |
name = sqlite3_column_text(stmt, 0); |
Line 1957 dbadd(struct mpage *mpage, struct mchars *mc) |
|
Line 1956 dbadd(struct mpage *mpage, struct mchars *mc) |
|
dbadd_mlink(mlink); |
dbadd_mlink(mlink); |
mlink = mlink->next; |
mlink = mlink->next; |
} |
} |
|
mlink = mpage->mlinks; |
|
|
for (key = ohash_first(&names, &slot); NULL != key; |
for (key = ohash_first(&names, &slot); NULL != key; |
key = ohash_next(&names, &slot)) { |
key = ohash_next(&names, &slot)) { |