From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from krisdoz.my.domain (schwarze@localhost [127.0.0.1])
	by krisdoz.my.domain (8.14.5/8.14.5) with ESMTP id s6PIKdkV009539
	for <source@mdocml.bsd.lv>; Fri, 25 Jul 2014 14:20:39 -0400 (EDT)
Received: (from schwarze@localhost)
	by krisdoz.my.domain (8.14.5/8.14.3/Submit) id s6PIKd85014254;
	Fri, 25 Jul 2014 14:20:39 -0400 (EDT)
Date: Fri, 25 Jul 2014 14:20:39 -0400 (EDT)
Message-Id: <201407251820.s6PIKd85014254@krisdoz.my.domain>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: We cannot easily control the order of the QUERY_STRING keys 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

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("&amp;manpath=");
-		html_print(req->q.manpath);
+	if (NULL != req->q.query) {
+		printf("query=");
+		html_print(req->q.query);
 	}
+	if (0 == req->q.equal)
+		printf("&amp;apropos=1");
 	if (NULL != req->q.sec) {
 		printf("&amp;sec=");
 		html_print(req->q.sec);
@@ -184,12 +187,11 @@ html_printquery(const struct req *req)
 		printf("&amp;arch=");
 		html_print(req->q.arch);
 	}
-	if (NULL != req->q.query) {
-		printf("&amp;query=");
-		html_print(req->q.query);
+	if (NULL != req->q.manpath &&
+	    strcmp(req->q.manpath, req->p[0])) {
+		printf("&amp;manpath=");
+		html_print(req->q.manpath);
 	}
-	if (0 == req->q.equal)
-		printf("&amp;apropos=1");
 }
 
 static void
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv