-/* $Id: cgi.c,v 1.10 2011/12/07 00:23:04 kristaps Exp $ */
+/* $Id: cgi.c,v 1.16 2011/12/07 16:18:52 kristaps Exp $ */
/*
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
*
static int atou(const char *, unsigned *);
static void catman(const char *);
+static int cmp(const void *, const void *);
static void format(const char *);
static void html_print(const char *);
static void html_putchar(char);
" \"http://www.w3.org/TR/html4/strict.dtd\">" "\n"
"<HTML>" "\n"
" <HEAD>" "\n"
- " <META HTTP-EQUIV=\"Content-Type\" " "\n"
- " CONTENT=\"text/html; charset=utf-8\">" "\n"
+ " <META HTTP-EQUIV=\"Content-Type\" " "\n"
+ " CONTENT=\"text/html; charset=utf-8\">" "\n"
+ " <LINK REL=\"stylesheet\" HREF=\"/man.cgi.css\"" "\n"
+ " TYPE=\"text/css\" media=\"all\">" "\n"
" <TITLE>System Manpage Reference</TITLE>" "\n"
" </HEAD>" "\n"
" <BODY>" "\n"
for (i = 0; i < (int)req->fieldsz; i++)
if (0 == strcmp(req->fields[i].key, "expr"))
expr = req->fields[i].val;
+ else if (0 == strcmp(req->fields[i].key, "query"))
+ expr = 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;
+ if (NULL != sec && 0 == strcmp(sec, "0"))
+ sec = NULL;
+
puts("<!-- Begin search form. //-->");
printf("<FORM ACTION=\"");
html_print(progname);
printf("/search.html\" METHOD=\"get\">\n");
- puts(" <FIELDSET>\n"
- " <INPUT TYPE=\"submit\" VALUE=\"Search:\">");
- printf(" Terms: <INPUT TYPE=\"text\" "
- "SIZE=\"60\" NAME=\"expr\" VALUE=\"");
+ printf("<FIELDSET>\n"
+ "<LEGEND>Search Parameters</LEGEND>\n"
+ "<INPUT TYPE=\"submit\" NAME=\"op\" "
+ "VALUE=\"Whatis\"> or \n"
+ "<INPUT TYPE=\"submit\" NAME=\"op\" "
+ "VALUE=\"apropos\"> for manuals satisfying \n"
+ "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"");
html_print(expr);
- puts("\">");
- printf(" Section: <INPUT TYPE=\"text\" "
- "SIZE=\"4\" NAME=\"sec\" VALUE=\"");
+ printf("\">, section "
+ "<INPUT TYPE=\"text\" "
+ "SIZE=\"4\" NAME=\"sec\" VALUE=\"");
html_print(sec);
- puts("\">");
- printf(" Arch: <INPUT TYPE=\"text\" "
- "SIZE=\"8\" NAME=\"arch\" VALUE=\"");
+ printf("\">, arch "
+ "<INPUT TYPE=\"text\" "
+ "SIZE=\"8\" NAME=\"arch\" VALUE=\"");
html_print(arch);
- puts("\">");
- puts(" </FIELDSET>\n</FORM>\n<!-- End search form. //-->");
+ puts("\">.\n"
+ "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n"
+ "</FIELDSET>\n"
+ "</FORM>\n"
+ "<!-- End search form. //-->");
}
static void
{
resp_begin_html(400, "Query Malformed");
- puts("<H1>Malformed Query</H1>\n"
- "<P>\n"
- " The query your entered was malformed.\n"
- " Try again from the\n"
- " <A HREF=\"/index.html\">main page</A>\n"
- "</P>");
+ printf("<H1>Malformed Query</H1>\n"
+ " The query your entered was malformed.\n"
+ " Try again from the\n"
+ " <A HREF=\"%s/index.html\">main page</A>\n"
+ "</P>", progname);
resp_end_html();
}
" The page you're looking for, ");
printf(" <B>");
html_print(page);
- puts("</B>,\n"
- " could not be found.\n"
- " Try searching from the\n"
- " <A HREF=\"/index.html\">main page</A>\n"
- "</P>");
+ printf("</B>,\n"
+ " could not be found.\n"
+ " Try searching from the\n"
+ " <A HREF=\"%s/index.html\">main page</A>\n"
+ "</P>", progname);
resp_end_html();
}
return;
}
+ qsort(r, sz, sizeof(struct res), cmp);
+
resp_begin_html(200, NULL);
resp_searchform((const struct req *)arg);
- if (0 == sz)
+ if (0 == sz) {
puts("<P>No results found.</P>");
+ resp_end_html();
+ return;
+ }
+
+ puts("<P></P>\n"
+ "<TABLE>");
for (i = 0; i < (int)sz; i++) {
- printf("<
P><A HREF=\"");
+ printf("<
TR><TD CLASS=\"title\"><A HREF=\"");
html_print(progname);
printf("/show/%u/%u.html\">", r[i].volume, r[i].rec);
html_print(r[i].title);
putchar('/');
html_print(r[i].arch);
}
- printf(")</A> ");
+ printf(")</A></TD><TD CLASS=\"desc\">");
html_print(r[i].desc);
- puts("</P>");
+ puts("</TD></TR>");
}
+ puts("</TABLE>");
+
resp_end_html();
}
return;
}
- resp_begin_html(200, NULL);
+ resp_begin_http(200, NULL);
+ puts("<!DOCTYPE HTML PUBLIC " "\n"
+ " \"-//W3C//DTD HTML 4.01//EN\"" "\n"
+ " \"http://www.w3.org/TR/html4/strict.dtd\">" "\n"
+ "<HTML>" "\n"
+ " <HEAD>" "\n"
+ " <META HTTP-EQUIV=\"Content-Type\" " "\n"
+ " CONTENT=\"text/html; charset=utf-8\">" "\n"
+ " <LINK REL=\"stylesheet\" HREF=\"/catman.css\"" "\n"
+ " TYPE=\"text/css\" media=\"all\">" "\n"
+ " <TITLE>System Manpage Reference</TITLE>" "\n"
+ " </HEAD>" "\n"
+ " <BODY>" "\n"
+ "<!-- Begin page content. //-->");
puts("<PRE>");
while (NULL != (p = fgetln(f, &len))) {
return;
}
- snprintf(opts, sizeof(opts), "style=/style.css,"
+ snprintf(opts, sizeof(opts), "style=/man.css,"
"man=%s/search.html?sec=%%S&expr=%%N,"
- "includes=/cgi-bin/man.cgi/usr/include/%%I",
+ /*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
progname);
mparse_result(mp, &mdoc, &man);
pg_search(const struct manpaths *ps, const struct req *req, char *path)
{
size_t tt;
- int i, sz, rc;
+ int i, sz, rc, whatis;
const char *ep, *start;
char **cp;
struct opts opt;
cp = NULL;
ep = NULL;
sz = 0;
+ whatis = 1;
memset(&opt, 0, sizeof(struct opts));
for (sz = 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"))
opt.cat = req->fields[i].val;
+ else if (0 == strcmp(req->fields[i].key, "sektion"))
+ opt.cat = req->fields[i].val;
else if (0 == strcmp(req->fields[i].key, "arch"))
opt.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");
+
+ if (NULL != opt.cat && 0 == strcmp(opt.cat, "0"))
+ opt.cat = NULL;
/*
* Poor man's tokenisation.
* The resp_search() function is called with the results.
*/
- if (NULL != (expr = exprcomp(sz, cp, &tt)))
+ expr = whatis ? termcomp(sz, cp, &tt) :
+ exprcomp(sz, cp, &tt);
+
+ if (NULL != expr)
rc = apropos_search
(ps->sz, ps->paths, &opt,
expr, tt, (void *)req, resp_search);
return(EXIT_SUCCESS);
}
+
+static int
+cmp(const void *p1, const void *p2)
+{
+
+ return(strcasecmp(((const struct res *)p1)->title,
+ ((const struct res *)p2)->title));
+}
+
git.ckatri.com / mandoc.git / blobdiff