version 1.80, 2014/07/22 18:14:13 |
version 1.81, 2014/07/24 08:26:57 |
Line 422 resp_searchform(const struct req *req) |
|
Line 422 resp_searchform(const struct req *req) |
|
|
|
/* Write architecture selector. */ |
/* Write architecture selector. */ |
|
|
puts("<SELECT NAME=\"arch\">"); |
printf( "<SELECT NAME=\"arch\">\n" |
|
"<OPTION VALUE=\"default\""); |
|
if (NULL == req->q.arch) |
|
printf(" SELECTED"); |
|
puts(">All Architectures</OPTION>"); |
for (i = 0; i < arch_MAX; i++) { |
for (i = 0; i < arch_MAX; i++) { |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
printf("<OPTION VALUE=\"%s\"", arch_names[i]); |
if (NULL != req->q.arch && |
if (NULL != req->q.arch && |
Line 559 pg_error_internal(void) |
|
Line 563 pg_error_internal(void) |
|
static void |
static void |
pg_searchres(const struct req *req, struct manpage *r, size_t sz) |
pg_searchres(const struct req *req, struct manpage *r, size_t sz) |
{ |
{ |
|
char *arch, *archend; |
size_t i, iuse, isec; |
size_t i, iuse, isec; |
|
int archprio, archpriouse; |
int prio, priouse; |
int prio, priouse; |
char sec; |
char sec; |
|
|
Line 622 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 628 pg_searchres(const struct req *req, struct manpage *r, |
|
puts("<HR>"); |
puts("<HR>"); |
iuse = 0; |
iuse = 0; |
priouse = 10; |
priouse = 10; |
|
archpriouse = 3; |
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
isec = strcspn(r[i].file, "123456789"); |
isec = strcspn(r[i].file, "123456789"); |
sec = r[i].file[isec]; |
sec = r[i].file[isec]; |
if ('\0' == sec) |
if ('\0' == sec) |
continue; |
continue; |
prio = sec_prios[sec - '1']; |
prio = sec_prios[sec - '1']; |
|
if (NULL == req->q.arch) { |
|
archprio = |
|
(NULL == (arch = strchr( |
|
r[i].file + isec, '/'))) ? 3 : |
|
(NULL == (archend = strchr( |
|
arch + 1, '/'))) ? 0 : |
|
strncmp(arch, "amd64/", |
|
archend - arch) ? 2 : 1; |
|
if (archprio < archpriouse) { |
|
archpriouse = archprio; |
|
priouse = prio; |
|
iuse = i; |
|
continue; |
|
} |
|
if (archprio > archpriouse) |
|
continue; |
|
} |
if (prio >= priouse) |
if (prio >= priouse) |
continue; |
continue; |
priouse = prio; |
priouse = prio; |