/*
- Copyright (C) 2010-2011 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 published by
- the Free Software Foundation; either version 2 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 General Public License for more details.
-
- You should have received a copy of the GNU 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
-*/
-
+ * 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
+ * published by the Free Software Foundation; either version 2 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+ */
+#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+
#include "psensor_json.h"
+#include "url.h"
#define ATT_SENSOR_ID "id"
#define ATT_SENSOR_NAME "name"
json_object_object_add(o,
ATT_MEASURE_VALUE,
- json_object_new_double(m->value.d_num));
+ json_object_new_double(m->value));
json_object_object_add(o, ATT_MEASURE_TIME,
json_object_new_int((m->time).tv_sec));
return o;
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));
mo = json_object_new_object();
json_object_object_add(mo,
ATT_MEASURE_VALUE,
- json_object_new_double(m->value.d_num));
+ json_object_new_double(m->value));
json_object_object_add(mo, ATT_MEASURE_TIME,
json_object_new_int((m->time).tv_sec));
json_object_object_add(obj, ATT_SENSOR_LAST_MEASURE, mo);
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));
return str;
}
+struct psensor *psensor_new_from_json(json_object *o,
+ const char *sensors_url,
+ int values_max_length)
+{
+ json_object *oid, *oname, *otype;
+ struct psensor *s;
+ char *eid, *url;
+
+ 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);
+ sprintf(url, "%s/%s", sensors_url, eid);
+
+ s = psensor_create(strdup(url),
+ strdup(json_object_get_string(oname)),
+ NULL,
+ json_object_get_int(otype) | SENSOR_TYPE_REMOTE,
+ values_max_length);
+ s->provider_data = url;
+
+ free(eid);
+
+ return s;
+}
+