===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -p -r1.13 -r1.16
--- mandoc/cgi.c	2011/12/07 15:12:34	1.13
+++ mandoc/cgi.c	2011/12/07 16:18:52	1.16
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.13 2011/12/07 15:12:34 kristaps Exp $ */
+/*	$Id: cgi.c,v 1.16 2011/12/07 16:18:52 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,6 +67,7 @@ struct	req {
 
 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);
@@ -295,8 +296,8 @@ resp_begin_html(int code, const char *msg)
 	     " \"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"
@@ -339,21 +340,21 @@ resp_searchform(const struct req *req)
 	printf("<FORM ACTION=\"");
 	html_print(progname);
 	printf("/search.html\" METHOD=\"get\">\n");
-	puts("<FIELDSET>\n"
-	     "<INPUT TYPE=\"submit\" NAME=\"op\" "
-	      "VALUE=\"Whatis\"> or \n"
-	     "<INPUT TYPE=\"submit\" NAME=\"op\" "
-	      "VALUE=\"apropos\"> for manuals satisfying \n"
-	     "<INPUT TYPE=\"text\" SIZE=\"40\" "
-	      "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("\">, section "
-	     "<INPUT TYPE=\"text\" "
-	      "SIZE=\"4\" NAME=\"sec\" VALUE=\"");
+	printf("\">, section "
+	       "<INPUT TYPE=\"text\" "
+	        "SIZE=\"4\" NAME=\"sec\" VALUE=\"");
 	html_print(sec);
-	puts("\">, arch "
-	     "<INPUT TYPE=\"text\" "
-	      "SIZE=\"8\" NAME=\"arch\" VALUE=\"");
+	printf("\">, arch "
+	       "<INPUT TYPE=\"text\" "
+	        "SIZE=\"8\" NAME=\"arch\" VALUE=\"");
 	html_print(arch);
 	puts("\">.\n"
 	     "<INPUT TYPE=\"reset\" VALUE=\"Reset\">\n"
@@ -438,14 +439,22 @@ resp_search(struct res *r, size_t sz, void *arg)
 		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);
@@ -455,11 +464,13 @@ resp_search(struct res *r, size_t sz, void *arg)
 			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();
 }
 
@@ -745,7 +756,7 @@ pg_search(const struct manpaths *ps, const struct req 
 	cp = NULL;
 	ep = NULL;
 	sz = 0;
-	whatis = 0;
+	whatis = 1;
 
 	memset(&opt, 0, sizeof(struct opts));
 
@@ -910,3 +921,12 @@ main(void)
 
 	return(EXIT_SUCCESS);
 }
+
+static int
+cmp(const void *p1, const void *p2)
+{
+
+	return(strcasecmp(((const struct res *)p1)->title,
+				((const struct res *)p2)->title));
+}
+

No results found.