From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: We cannot easily control the order of the QUERY_STRING keys
Date: Fri, 25 Jul 2014 14:20:39 -0400 (EDT) [thread overview]
Message-ID: <201407251820.s6PIKd85014254@krisdoz.my.domain> (raw)
Log Message:
-----------
We cannot easily control the order of the QUERY_STRING keys generated
by the search form, it's just the order of the fields in the form.
Actually, that's not too bad; the generated URI resembles the
generating form.
To minimize confusion for people looking at URIs, give the keys
in the same order when generating URIs for search listings and
search redirections, the latter being used instead of search
listings that would have only one single entry. Also, if the
manpath is the default, remove it form the generated URIs.
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.87
retrieving revision 1.88
diff -Lcgi.c -Lcgi.c -u -p -r1.87 -r1.88
--- cgi.c
+++ cgi.c
@@ -148,10 +148,12 @@ static void
http_printquery(const struct req *req)
{
- if (NULL != req->q.manpath) {
- printf("&manpath=");
- http_print(req->q.manpath);
+ if (NULL != req->q.query) {
+ printf("query=");
+ http_print(req->q.query);
}
+ if (0 == req->q.equal)
+ printf("&apropos=1");
if (NULL != req->q.sec) {
printf("&sec=");
http_print(req->q.sec);
@@ -160,22 +162,23 @@ http_printquery(const struct req *req)
printf("&arch=");
http_print(req->q.arch);
}
- if (NULL != req->q.query) {
- printf("&query=");
- http_print(req->q.query);
+ if (NULL != req->q.manpath &&
+ strcmp(req->q.manpath, req->p[0])) {
+ printf("&manpath=");
+ http_print(req->q.manpath);
}
- if (0 == req->q.equal)
- printf("&apropos=1");
}
static void
html_printquery(const struct req *req)
{
- if (NULL != req->q.manpath) {
- printf("&manpath=");
- html_print(req->q.manpath);
+ if (NULL != req->q.query) {
+ printf("query=");
+ html_print(req->q.query);
}
+ if (0 == req->q.equal)
+ printf("&apropos=1");
if (NULL != req->q.sec) {
printf("&sec=");
html_print(req->q.sec);
@@ -184,12 +187,11 @@ html_printquery(const struct req *req)
printf("&arch=");
html_print(req->q.arch);
}
- if (NULL != req->q.query) {
- printf("&query=");
- html_print(req->q.query);
+ if (NULL != req->q.manpath &&
+ strcmp(req->q.manpath, req->p[0])) {
+ printf("&manpath=");
+ html_print(req->q.manpath);
}
- if (0 == req->q.equal)
- printf("&apropos=1");
}
static void
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2014-07-25 18:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201407251820.s6PIKd85014254@krisdoz.my.domain \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).