version 1.24, 2014/03/23 12:11:18 |
version 1.26, 2014/04/09 21:50:08 |
|
|
|
|
struct match { |
struct match { |
uint64_t id; /* identifier in database */ |
uint64_t id; /* identifier in database */ |
|
char *desc; /* manual page description */ |
int form; /* 0 == catpage */ |
int form; /* 0 == catpage */ |
}; |
}; |
|
|
Line 220 mansearch(const struct mansearch *search, |
|
Line 221 mansearch(const struct mansearch *search, |
|
SQL_BIND_BLOB(db, s, j, ep->regexp); |
SQL_BIND_BLOB(db, s, j, ep->regexp); |
} else |
} else |
SQL_BIND_TEXT(db, s, j, ep->substr); |
SQL_BIND_TEXT(db, s, j, ep->substr); |
SQL_BIND_INT64(db, s, j, ep->bits); |
if (0 == (TYPE_Nd & ep->bits)) |
|
SQL_BIND_INT64(db, s, j, ep->bits); |
} |
} |
|
|
memset(&htab, 0, sizeof(struct ohash)); |
memset(&htab, 0, sizeof(struct ohash)); |
Line 235 mansearch(const struct mansearch *search, |
|
Line 237 mansearch(const struct mansearch *search, |
|
* distribution of buckets in the table. |
* distribution of buckets in the table. |
*/ |
*/ |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
while (SQLITE_ROW == (c = sqlite3_step(s))) { |
id = sqlite3_column_int64(s, 1); |
id = sqlite3_column_int64(s, 2); |
idx = ohash_lookup_memory |
idx = ohash_lookup_memory |
(&htab, (char *)&id, |
(&htab, (char *)&id, |
sizeof(uint64_t), (uint32_t)id); |
sizeof(uint64_t), (uint32_t)id); |
|
|
if (NULL != ohash_find(&htab, idx)) |
if (NULL != ohash_find(&htab, idx)) |
Line 245 mansearch(const struct mansearch *search, |
|
Line 247 mansearch(const struct mansearch *search, |
|
|
|
mp = mandoc_calloc(1, sizeof(struct match)); |
mp = mandoc_calloc(1, sizeof(struct match)); |
mp->id = id; |
mp->id = id; |
mp->form = sqlite3_column_int(s, 0); |
mp->form = sqlite3_column_int(s, 1); |
|
if (TYPE_Nd == outbit) |
|
mp->desc = mandoc_strdup( |
|
sqlite3_column_text(s, 0)); |
ohash_insert(&htab, idx, mp); |
ohash_insert(&htab, idx, mp); |
} |
} |
|
|
Line 279 mansearch(const struct mansearch *search, |
|
Line 284 mansearch(const struct mansearch *search, |
|
mpage->form = mp->form; |
mpage->form = mp->form; |
buildnames(mpage, db, s, mp->id, |
buildnames(mpage, db, s, mp->id, |
paths->paths[i], mp->form); |
paths->paths[i], mp->form); |
mpage->output = outbit ? |
mpage->output = TYPE_Nd & outbit ? |
|
mp->desc : outbit ? |
buildoutput(db, s2, mp->id, outbit) : NULL; |
buildoutput(db, s2, mp->id, outbit) : NULL; |
|
|
free(mp); |
free(mp); |
Line 310 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
Line 316 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3 |
|
size_t i; |
size_t i; |
int c; |
int c; |
|
|
|
mpage->file = NULL; |
mpage->names = NULL; |
mpage->names = NULL; |
prevsec = prevarch = NULL; |
prevsec = prevarch = NULL; |
i = 1; |
i = 1; |
Line 492 sql_statement(const struct expr *e) |
|
Line 499 sql_statement(const struct expr *e) |
|
sql_append(&sql, &sz, " OR ", 1); |
sql_append(&sql, &sz, " OR ", 1); |
if (e->open) |
if (e->open) |
sql_append(&sql, &sz, "(", e->open); |
sql_append(&sql, &sz, "(", e->open); |
sql_append(&sql, &sz, NULL == e->substr ? |
sql_append(&sql, &sz, |
"id IN (SELECT pageid FROM keys " |
TYPE_Nd & e->bits |
"WHERE key REGEXP ? AND bits & ?)" : |
? (NULL == e->substr |
"id IN (SELECT pageid FROM keys " |
? "desc REGEXP ?" |
"WHERE key MATCH ? AND bits & ?)", 1); |
: "desc MATCH ?") |
|
: (NULL == e->substr |
|
? "id IN (SELECT pageid FROM keys " |
|
"WHERE key REGEXP ? AND bits & ?)" |
|
: "id IN (SELECT pageid FROM keys " |
|
"WHERE key MATCH ? AND bits & ?)"), 1); |
if (e->close) |
if (e->close) |
sql_append(&sql, &sz, ")", e->close); |
sql_append(&sql, &sz, ")", e->close); |
needop = 1; |
needop = 1; |
Line 553 exprcomp(const struct mansearch *search, int argc, cha |
|
Line 565 exprcomp(const struct mansearch *search, int argc, cha |
|
next = exprterm(search, argv[i], !igncase); |
next = exprterm(search, argv[i], !igncase); |
if (NULL == next) |
if (NULL == next) |
goto fail; |
goto fail; |
next->open = toopen; |
if (NULL == first) |
next->and = (1 == logic); |
first = next; |
if (NULL != first) { |
else |
cur->next = next; |
cur->next = next; |
cur = next; |
|
|
/* |
|
* Searching for descriptions must be split out |
|
* because they are stored in the mpages table, |
|
* not in the keys table. |
|
*/ |
|
|
|
if (TYPE_Nd & next->bits && ~TYPE_Nd & next->bits) { |
|
cur = mandoc_calloc(1, sizeof(struct expr)); |
|
memcpy(cur, next, sizeof(struct expr)); |
|
next->open = 1; |
|
next->bits = TYPE_Nd; |
|
next->next = cur; |
|
cur->bits &= ~TYPE_Nd; |
|
cur->close = 1; |
} else |
} else |
cur = first = next; |
cur = next; |
|
next->and = (1 == logic); |
|
next->open += toopen; |
toopen = logic = igncase = 0; |
toopen = logic = igncase = 0; |
} |
} |
if (toopen || logic || igncase || toclose) |
if (toopen || logic || igncase || toclose) |