X-Git-Url: https://git.octo.it/?p=collection4.git;a=blobdiff_plain;f=src%2Fgraph_ident.c;h=24f89c5e76c2003b8dd2f9dd7bc2c6742df3c084;hp=e2d3cd68c9f76c05f399b50c1099cf03289da076;hb=e0517eecbe0add2e72bef226f6d1bf0f279c9ed0;hpb=17568ea3f6ee71873e6758497e836b43b784e5c0

diff --git a/src/graph_ident.c b/src/graph_ident.c
index e2d3cd6..24f89c5 100644
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
@@ -21,6 +21,8 @@
  *   Florian octo Forster <ff at octo.it>
  **/
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -30,6 +32,7 @@
 #include <limits.h> /* PATH_MAX */
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <math.h>
 
 #include "graph_ident.h"
 #include "common.h"
@@ -558,23 +561,52 @@ static int ident_data_to_json__get_ident_data (
   ident_data_to_json__data_t *data = user_data;
   size_t i;
 
-  yajl_gen_map_open (data->handler);
+  /* TODO: Make points_num_limit configurable. */
+  /* points_num_limit: The number of data-points to send at least. */
+  size_t points_num_limit = 400;
+  size_t points_consolidate;
+
+  if (dp_num <= points_num_limit)
+    points_consolidate = 1;
+  else
+    points_consolidate = dp_num / points_num_limit;
+
+  yajl_gen_array_open (data->handler);
 
-  for (i = 0; i < dp_num; i++)
+  for (i = (dp_num % points_consolidate); i < dp_num; i += points_consolidate)
   {
-    yajl_gen_map_open (data->handler);
+    size_t j;
+
+    double sum = 0.0;
+    long num = 0;
+
+    yajl_gen_array_open (data->handler);
     yajl_gen_integer (data->handler, (long) dp[i].time.tv_sec);
-    yajl_gen_double (data->handler, dp[i].value);
-    yajl_gen_map_close (data->handler);
+
+    for (j = 0; j < points_consolidate; j++)
+    {
+      if (isnan (dp[i+j].value))
+        continue;
+
+      sum += dp[i+j].value;
+      num++;
+    }
+
+    if (num == 0)
+      yajl_gen_null (data->handler);
+    else
+      yajl_gen_double (data->handler, sum / ((double) num));
+
+    yajl_gen_array_close (data->handler);
   }
 
-  yajl_gen_map_close (data->handler);
+  yajl_gen_array_close (data->handler);
 
   return (0);
 } /* }}} int ident_data_to_json__get_ident_data */
 
 /* Called for each DS name */
-static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ */
+static int ident_data_to_json__get_ds_name (graph_ident_t *ident, /* {{{ */
     const char *ds_name, void *user_data)
 {
   ident_data_to_json__data_t *data = user_data;
@@ -582,24 +614,24 @@ static int ident_data_to_json__get_ds_name (const graph_ident_t *ident, /* {{{ *
 
   yajl_gen_map_open (data->handler);
 
-  yajl_gen_string_cast (data->handler, "ds_name", strlen ("ds_name"));
+  yajl_gen_string_cast (data->handler, "file", strlen ("file"));
+  ident_to_json (ident, data->handler);
+
+  yajl_gen_string_cast (data->handler, "data_source", strlen ("data_source"));
   yajl_gen_string_cast (data->handler, ds_name, strlen (ds_name));
 
   yajl_gen_string_cast (data->handler, "data", strlen ("data"));
-  yajl_gen_array_open (data->handler);
-
   status = data_provider_get_ident_data (ident, ds_name,
       data->begin, data->end,
       ident_data_to_json__get_ident_data,
       data);
 
-  yajl_gen_array_close (data->handler);
   yajl_gen_map_close (data->handler);
 
   return (status);
 } /* }}} int ident_data_to_json__get_ds_name */
 
-int ident_data_to_json (const graph_ident_t *ident, /* {{{ */
+int ident_data_to_json (graph_ident_t *ident, /* {{{ */
     dp_time_t begin, dp_time_t end,
     yajl_gen handler)
 {