version 1.15, 2011/12/07 16:08:55 |
version 1.19, 2011/12/08 22:47:09 |
Line 341 resp_searchform(const struct req *req) |
|
Line 341 resp_searchform(const struct req *req) |
|
html_print(progname); |
html_print(progname); |
printf("/search.html\" METHOD=\"get\">\n"); |
printf("/search.html\" METHOD=\"get\">\n"); |
printf("<FIELDSET>\n" |
printf("<FIELDSET>\n" |
|
"<LEGEND>Search Parameters</LEGEND>\n" |
"<INPUT TYPE=\"submit\" NAME=\"op\" " |
"<INPUT TYPE=\"submit\" NAME=\"op\" " |
"VALUE=\"Whatis\"> or \n" |
"VALUE=\"Whatis\"> or \n" |
"<INPUT TYPE=\"submit\" NAME=\"op\" " |
"<INPUT TYPE=\"submit\" NAME=\"op\" " |
Line 423 resp_baddb(void) |
|
Line 424 resp_baddb(void) |
|
static void |
static void |
resp_search(struct res *r, size_t sz, void *arg) |
resp_search(struct res *r, size_t sz, void *arg) |
{ |
{ |
int i; |
int i, whatis; |
|
const char *ep, *sec, *arch; |
|
const struct req *req; |
|
|
|
whatis = 1; |
|
ep = sec = arch = NULL; |
|
|
if (1 == sz) { |
if (1 == sz) { |
/* |
/* |
* If we have just one result, then jump there now |
* If we have just one result, then jump there now |
Line 438 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 444 resp_search(struct res *r, size_t sz, void *arg) |
|
return; |
return; |
} |
} |
|
|
|
req = (const struct req *)arg; |
|
|
|
for (i = 0; i < (int)req->fieldsz; i++) |
|
if (0 == strcmp(req->fields[i].key, "expr")) |
|
ep = req->fields[i].val; |
|
else if (0 == strcmp(req->fields[i].key, "query")) |
|
ep = req->fields[i].val; |
|
else if (0 == strcmp(req->fields[i].key, "sec")) |
|
sec = req->fields[i].val; |
|
else if (0 == strcmp(req->fields[i].key, "sektion")) |
|
sec = req->fields[i].val; |
|
else if (0 == strcmp(req->fields[i].key, "arch")) |
|
arch = req->fields[i].val; |
|
else if (0 == strcmp(req->fields[i].key, "apropos")) |
|
whatis = 0 == strcmp |
|
(req->fields[i].val, "0"); |
|
else if (0 == strcmp(req->fields[i].key, "op")) |
|
whatis = 0 == strcasecmp |
|
(req->fields[i].val, "whatis"); |
|
|
qsort(r, sz, sizeof(struct res), cmp); |
qsort(r, sz, sizeof(struct res), cmp); |
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform((const struct req *)arg); |
resp_searchform(req); |
|
|
if (0 == sz) { |
if (0 == sz) { |
puts("<P>No results found.</P>"); |
puts("<P>\n" |
|
"No results found."); |
|
if (whatis) { |
|
printf("(Try <A HREF=\""); |
|
html_print(progname); |
|
printf("/search.html?op=apropos&expr="); |
|
html_print(ep ? ep : ""); |
|
printf("&sec="); |
|
html_print(sec ? sec : ""); |
|
printf("&arch="); |
|
html_print(arch ? arch : ""); |
|
puts("\">apropos</A>?)"); |
|
} |
|
puts("</P>"); |
resp_end_html(); |
resp_end_html(); |
return; |
return; |
} |
} |
Line 468 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 507 resp_search(struct res *r, size_t sz, void *arg) |
|
puts("</TD></TR>"); |
puts("</TD></TR>"); |
} |
} |
|
|
|
puts("</TABLE>"); |
|
|
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
Line 727 pg_show(const struct manpaths *ps, const struct req *r |
|
Line 768 pg_show(const struct manpaths *ps, const struct req *r |
|
else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) |
else if (NULL == memchr(fn, '\0', val.size - (fn - cp))) |
resp_baddb(); |
resp_baddb(); |
else { |
else { |
strlcpy(file, ps->paths[vol], MAXPATHLEN); |
strlcpy(file, cache, MAXPATHLEN); |
strlcat(file, "/", MAXPATHLEN); |
strlcat(file, "/", MAXPATHLEN); |
strlcat(file, fn, MAXPATHLEN); |
strlcat(file, fn, MAXPATHLEN); |
if (0 == strcmp(cp, "cat")) |
if (0 == strcmp(cp, "cat")) |