/*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+
#include "psensor_json.h"
#include "url.h"
json_object_object_add(obj,
ATT_SENSOR_TYPE, json_object_new_int(s->type));
json_object_object_add(obj,
- ATT_SENSOR_MIN, json_object_new_double(s->min));
+ ATT_SENSOR_MIN,
+ json_object_new_double(s->sess_lowest));
json_object_object_add(obj,
- ATT_SENSOR_MAX, json_object_new_double(s->max));
+ ATT_SENSOR_MAX,
+ json_object_new_double(s->sess_highest));
json_object_object_add(obj,
ATT_SENSOR_MEASURES,
measures_to_json_object(s));
char *str;
json_object *obj = json_object_new_array();
- sensors_cur = sensors;
+ if (sensors) {
+ sensors_cur = sensors;
- while (*sensors_cur) {
- struct psensor *s = *sensors_cur;
+ while (*sensors_cur) {
+ struct psensor *s = *sensors_cur;
- json_object_array_add(obj, sensor_to_json(s));
+ json_object_array_add(obj, sensor_to_json(s));
- sensors_cur++;
+ sensors_cur++;
+ }
}
str = strdup(json_object_to_json_string(obj));
struct psensor *s;
char *eid, *url;
- oid = json_object_object_get(o, "id");
- oname = json_object_object_get(o, "name");
- otype = json_object_object_get(o, "type");
+ json_object_object_get_ex(o, "id", &oid);
+ json_object_object_get_ex(o, "name", &oname);
+ json_object_object_get_ex(o, "type", &otype);
eid = url_encode(json_object_get_string(oid));
url = malloc(strlen(sensors_url) + 1 + strlen(eid) + 1);
NULL,
json_object_get_int(otype) | SENSOR_TYPE_REMOTE,
values_max_length);
- s->url = url;
+ s->provider_data = url;
free(eid);