"show instance" action: Parse the time parameters and pass them along to the "graph...

[collection4.git] / src / action_show_instance.c

diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index a45fb49..08d1bc0 100644 (file)
--- a/src/action_show_instance.c
+++ b/src/action_show_instance.c
@@ -1,3 +1,26 @@
+/**
+ * collection4 - action_show_instance.c
+ * Copyright (C) 2010  Florian octo Forster
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ *
+ * Authors:
+ *   Florian octo Forster <ff at octo.it>
+ **/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -23,10 +46,13 @@
   return (0);                              \
 } while (0)
 
+#define MAX_SHOW_GRAPHS 10
+
 struct show_graph_data_s
 {
   graph_config_t *cfg;
   graph_instance_t *inst;
+  int graph_count;
 };
 typedef struct show_graph_data_s show_graph_data_t;
 
@@ -54,20 +80,21 @@ static void show_breadcrump_field (const char *str, /* {{{ */
   }
 } /* }}} void show_breadcrump_field */
 
-static int show_breadcrump (show_graph_data_t *data) /* {{{ */
+static int show_breadcrump (graph_config_t *cfg, /* {{{ */
+    graph_instance_t *inst)
 {
   graph_ident_t *ident;
   char *prefix;
 
-  if (data->inst != NULL)
+  if (inst != NULL)
   {
     prefix = "Instance";
-    ident = inst_get_selector (data->inst);
+    ident = inst_get_selector (inst);
   }
   else
   {
     prefix = "Graph";
-    ident = graph_get_selector (data->cfg);
+    ident = graph_get_selector (cfg);
   }
 
   printf ("<div class=\"breadcrump\">%s: &quot;", prefix);
@@ -82,6 +109,7 @@ static int show_breadcrump (show_graph_data_t *data) /* {{{ */
   show_breadcrump_field (ident_get_type_instance (ident), "type_instance");
   printf ("&quot;</div>\n");
 
+  ident_destroy (ident);
   return (0);
 } /* }}} int show_breadcrump */
 
@@ -136,7 +164,7 @@ static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
   html_escape_buffer (params, sizeof (params));
 
   printf ("    <li class=\"instance\">"
-      "<a href=\"%s?action=show_graph;%s\">%s</a></li>\n",
+      "<a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
       script_name (), params, descr);
 
   return (0);
@@ -157,7 +185,7 @@ static int show_instance_list (void *user_data) /* {{{ */
   html_escape_buffer (params, sizeof (params));
 
   printf ("<ul class=\"graph_list\">\n"
-      "  <li class=\"graph\"><a href=\"%s?action=show_graph;%s\">%s</a>\n"
+      "  <li class=\"graph\"><a href=\"%s?action=show_instance;%s\">%s</a>\n"
       "  <ul class=\"instance_list\">\n",
       script_name (), params, title);
 
@@ -171,12 +199,18 @@ static int show_instance_list (void *user_data) /* {{{ */
 
 static int show_instance_cb (graph_config_t *cfg, /* {{{ */
     graph_instance_t *inst,
-    __attribute__((unused)) void *user_data)
+    void *user_data)
 {
+  show_graph_data_t *data = user_data;
   char title[128];
   char descr[128];
   char params[1024];
 
+  long begin;
+  long end;
+  char time_params[128];
+  int status;
+
   memset (title, 0, sizeof (title));
   graph_get_title (cfg, title, sizeof (title));
   html_escape_buffer (title, sizeof (title));
@@ -189,10 +223,32 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
   inst_get_params (cfg, inst, params, sizeof (params));
   html_escape_buffer (params, sizeof (params));
 
+  time_params[0] = 0;
+  begin = 0;
+  end = 0;
+
+  status = get_time_args (&begin, &end, /* now = */ NULL);
+  if (status == 0)
+  {
+    snprintf (time_params, sizeof (time_params), ";begin=%li;end=%li",
+        begin, end);
+    time_params[sizeof (time_params) - 1] = 0;
+  }
+
   printf ("<h3>Instance &quot;%s&quot;</h3>\n", descr);
-  printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s\" "
-      "title=\"%s / %s\" /></div>\n",
-      script_name (), params, title, descr);
+
+  show_breadcrump (cfg, inst);
+
+  if (data->graph_count < MAX_SHOW_GRAPHS)
+    printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s%s\" "
+        "title=\"%s / %s\" /></div>\n",
+        script_name (), params, time_params, title, descr);
+  else
+    printf ("<a href=\"%s?action=show_instance;%s\">Show graph "
+        "&quot;%s / %s&quot;</a>\n",
+        script_name (), params, title, descr);
+
+  data->graph_count++;
 
   return (0);
 } /* }}} int show_instance_cb */
@@ -204,7 +260,7 @@ static int show_instance (void *user_data) /* {{{ */
 
   fprintf (stderr, "show_instance: Calling inst_get_all_selected()\n");
   status = inst_get_all_selected (data->cfg,
-      /* callback = */ show_instance_cb, /* user data = */ NULL);
+      /* callback = */ show_instance_cb, /* user data = */ data);
   if (status != 0)
     fprintf (stderr, "show_instance: inst_get_all_selected failed "
         "with status %i\n", status);
@@ -212,14 +268,6 @@ static int show_instance (void *user_data) /* {{{ */
   return (0);
 } /* }}} int show_instance */
 
-static int show_graph (void *user_data) /* {{{ */
-{
-  show_graph_data_t *data = user_data;
-
-  show_breadcrump (data);
-  return (show_instance_list (user_data));
-} /* }}} int show_graph */
-
 int action_show_instance (void) /* {{{ */
 {
   page_callbacks_t pg_callbacks = PAGE_CALLBACKS_INIT;
@@ -228,6 +276,7 @@ int action_show_instance (void) /* {{{ */
   char tmp[128];
   char title[128];
 
+  memset (&pg_data, 0, sizeof (pg_data));
   pg_data.cfg = gl_graph_get_selected ();
   if (pg_data.cfg == NULL)
     OUTPUT_ERROR ("gl_graph_get_selected () failed.\n");