From: Florian Forster <ff@octo.it>
Date: Mon, 21 Jun 2010 13:27:59 +0000 (+0200)
Subject: Rename the "search" parameter to "q".
X-Git-Tag: v4.0.0~207
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=022298601cad5a59aba37fa205f6f5ae6a364956;p=collection4.git

Rename the "search" parameter to "q".
---

diff --git a/src/action_list_graphs.c b/src/action_list_graphs.c
index e32b999..86d6e43 100644
--- a/src/action_list_graphs.c
+++ b/src/action_list_graphs.c
@@ -213,7 +213,7 @@ static int print_host_list (__attribute__((unused)) void *user_data) /* {{{ */
 
     host_html = html_escape (host);
 
-    printf ("  <li><a href=\"%s?action=list_graphs&search=%s\">%s</a></li>\n",
+    printf ("  <li><a href=\"%s?action=list_graphs&q=%s\">%s</a></li>\n",
         script_name (), host_html, host_html);
 
     free (host_html);
@@ -256,10 +256,8 @@ int action_list_graphs (void) /* {{{ */
 
   gl_update ();
 
-  search = strtolower_copy (param ("search"));
-
+  search = strtolower_copy (param ("q"));
   status = list_graphs_html (search);
-
   free (search);
 
   return (status);
diff --git a/src/action_show_graph.c b/src/action_show_graph.c
index 5aaf25a..2f124de 100644
--- a/src/action_show_graph.c
+++ b/src/action_show_graph.c
@@ -39,7 +39,7 @@ static void show_breadcrump_field (const char *str) /* {{{ */
   else
   {
     char *str_html = html_escape (str);
-    printf ("<a href=\"%s?action=list_graphs;search=%s\">%s</a>",
+    printf ("<a href=\"%s?action=list_graphs;q=%s\">%s</a>",
         script_name (), str_html, str_html);
     free (str_html);
   }
diff --git a/src/utils_cgi.c b/src/utils_cgi.c
index 9030eb8..97dfc7c 100644
--- a/src/utils_cgi.c
+++ b/src/utils_cgi.c
@@ -439,11 +439,11 @@ int html_print_search_box (__attribute__((unused)) void *user_data) /* {{{ */
 {
   char *term_html;
 
-  term_html = html_escape (param ("search"));
+  term_html = html_escape (param ("q"));
 
-  printf ("<form action=\"%s\" method=\"get\">\n"
+  printf ("<form action=\"%s\" method=\"get\" id=\"search-form\">\n"
       "  <input type=\"hidden\" name=\"action\" value=\"list_graphs\" />\n"
-      "  <input type=\"text\" name=\"search\" value=\"%s\" id=\"search-input\" />\n"
+      "  <input type=\"text\" name=\"q\" value=\"%s\" id=\"search-input\" />\n"
       "  <input type=\"submit\" name=\"button\" value=\"Search\" />\n"
       "</form>\n",
       script_name (),