X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fgraph_ident.c;h=9c8bc6e2ed6e6be999e051a22fc069a1df152d99;hb=8178284eb603c7ba3eeef945fcfc2ac726364752;hp=3635990d8feb68a59960776c81f8d4acc872ba2c;hpb=e6c6e8043f974b474e912f0cf76e491721f4e2a9;p=collection4.git

diff --git a/src/graph_ident.c b/src/graph_ident.c
index 3635990..9c8bc6e 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,17 +561,22 @@ 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);
+  yajl_gen_array_open (data->handler);
 
   for (i = 0; i < dp_num; i++)
   {
-    yajl_gen_map_open (data->handler);
+    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);
+    if (isnan (dp[i].value))
+      yajl_gen_null (data->handler);
+    else
+      yajl_gen_double (data->handler, dp[i].value);
+    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 */
@@ -602,14 +610,20 @@ int ident_data_to_json (const graph_ident_t *ident, /* {{{ */
     yajl_gen handler)
 {
   ident_data_to_json__data_t data;
+  int status;
 
   data.begin = begin;
   data.end = end;
   data.handler = handler;
 
   /* Iterate over all DS names */
-  return (data_provider_get_ident_ds_names (ident,
-        ident_data_to_json__get_ds_name, &data));
+  status = data_provider_get_ident_ds_names (ident,
+      ident_data_to_json__get_ds_name, &data);
+  if (status != 0)
+    fprintf (stderr, "ident_data_to_json: data_provider_get_ident_ds_names "
+        "failed with status %i\n", status);
+
+  return (status);
 } /* }}} int ident_data_to_json */
 /* }}} ident_data_to_json */