diff --git a/src/graph_ident.c b/src/graph_ident.c
index 9c8bc6e2ed6e6be999e051a22fc069a1df152d99..7f37035512c273c60df0d3356e40f4869c3e158d 100644 (file)
--- a/src/graph_ident.c
+++ b/src/graph_ident.c
} /* }}} 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;
@@ -588,24 +588,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)
{