From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (kristaps@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.3/8.14.3) with ESMTP id pB7FCYQA004323
	for <source@mdocml.bsd.lv>; Wed, 7 Dec 2011 10:12:34 -0500 (EST)
Received: (from kristaps@localhost)
	by krisdoz.my.domain (8.14.3/8.14.3/Submit) id pB7FCYwF030457;
	Wed, 7 Dec 2011 10:12:34 -0500 (EST)
Date: Wed, 7 Dec 2011 10:12:34 -0500 (EST)
Message-Id: <201112071512.pB7FCYwF030457@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Accept old-school man.cgi parameters like "sektion" and "query".
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
Accept old-school man.cgi parameters like "sektion" and "query".  This still
needs work because specifying an arch with "arch=i386" will return results
that don't have an arch specified.  I think this is weird, but it will need
to be supported if we want backwards compatibility.

Modified Files:
--------------
    mdocml:
        cgi.c

Revision Data
-------------
Index: cgi.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/cgi.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lcgi.c -Lcgi.c -u -p -r1.12 -r1.13
--- cgi.c
+++ cgi.c
@@ -323,11 +323,18 @@ resp_searchform(const struct req *req)
 	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);
@@ -745,13 +752,23 @@ pg_search(const struct manpaths *ps, con
 	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.
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv