From a01cfb4d194d0ff7219d5d6da360066334331c33 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 22 Mar 2013 10:22:22 +0000 Subject: [PATCH] increment web api version (because definition of sensor type has changed) --- src/rsensor.c | 8 ++++---- src/server/server.c | 18 +++++++++--------- src/server/server.h | 10 +++++----- www/psensor.js | 14 +++++++------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/rsensor.c b/src/rsensor.c index 629bd0d..9bebb7a 100644 --- a/src/rsensor.c +++ b/src/rsensor.c @@ -55,17 +55,17 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp) return realsize; } -static char *create_api_1_0_sensors_url(const char *base_url) +static char *create_api_1_1_sensors_url(const char *base_url) { char *nurl, *ret; int n; nurl = url_normalize(base_url); - n = strlen(nurl) + strlen(URL_BASE_API_1_0_SENSORS) + 1; + n = strlen(nurl) + strlen(URL_BASE_API_1_1_SENSORS) + 1; ret = malloc(n); strcpy(ret, nurl); - strcat(ret, URL_BASE_API_1_0_SENSORS); + strcat(ret, URL_BASE_API_1_1_SENSORS); free(nurl); @@ -121,7 +121,7 @@ struct psensor **get_remote_sensors(const char *server_url, sensors = NULL; - url = create_api_1_0_sensors_url(server_url); + url = create_api_1_1_sensors_url(server_url); obj = get_json_object(url); diff --git a/src/server/server.c b/src/server/server.c index 65094ea..08a84a1 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -160,26 +160,26 @@ create_response_api(const char *nurl, const char *method, unsigned int *rp_code) struct psensor *s; char *page = NULL; - if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) { + if (!strcmp(nurl, URL_BASE_API_1_1_SENSORS)) { page = sensors_to_json_string(server_data.sensors); #ifdef HAVE_GTOP - } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) { + } else if (!strcmp(nurl, URL_API_1_1_SYSINFO)) { page = sysinfo_to_json_string(&server_data.psysinfo); - } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) { + } else if (!strcmp(nurl, URL_API_1_1_CPU_USAGE)) { page = sensor_to_json_string(server_data.cpu_usage); #endif - } else if (!strncmp(nurl, URL_BASE_API_1_0_SENSORS, - strlen(URL_BASE_API_1_0_SENSORS)) - && nurl[strlen(URL_BASE_API_1_0_SENSORS)] == '/') { + } else if (!strncmp(nurl, URL_BASE_API_1_1_SENSORS, + strlen(URL_BASE_API_1_1_SENSORS)) + && nurl[strlen(URL_BASE_API_1_1_SENSORS)] == '/') { - const char *sid = nurl + strlen(URL_BASE_API_1_0_SENSORS) + 1; + const char *sid = nurl + strlen(URL_BASE_API_1_1_SENSORS) + 1; s = psensor_list_get_by_id(server_data.sensors, sid); if (s) page = sensor_to_json_string(s); - } else if (!strcmp(nurl, URL_API_1_0_SERVER_STOP)) { + } else if (!strcmp(nurl, URL_API_1_1_SERVER_STOP)) { server_stop_requested = 1; page = strdup(HTML_STOP_REQUESTED); @@ -243,7 +243,7 @@ create_response(const char *nurl, const char *method, unsigned int *rp_code) { struct MHD_Response *resp = NULL; - if (!strncmp(nurl, URL_BASE_API_1_0, strlen(URL_BASE_API_1_0))) { + if (!strncmp(nurl, URL_BASE_API_1_1, strlen(URL_BASE_API_1_1))) { resp = create_response_api(nurl, method, rp_code); } else { char *fpath = get_path(nurl, server_data.www_dir); diff --git a/src/server/server.h b/src/server/server.h index dfac258..bc4f574 100644 --- a/src/server/server.h +++ b/src/server/server.h @@ -22,11 +22,11 @@ #include "psensor.h" #include "sysinfo.h" -#define URL_BASE_API_1_0 "/api/1.0" -#define URL_BASE_API_1_0_SENSORS "/api/1.0/sensors" -#define URL_API_1_0_SERVER_STOP "/api/1.0/server/stop" -#define URL_API_1_0_SYSINFO "/api/1.0/sysinfo" -#define URL_API_1_0_CPU_USAGE "/api/1.0/cpu/usage" +#define URL_BASE_API_1_1 "/api/1.1" +#define URL_BASE_API_1_1_SENSORS "/api/1.1/sensors" +#define URL_API_1_1_SERVER_STOP "/api/1.1/server/stop" +#define URL_API_1_1_SYSINFO "/api/1.1/sysinfo" +#define URL_API_1_1_CPU_USAGE "/api/1.1/cpu/usage" struct server_data { struct psensor *cpu_usage; diff --git a/www/psensor.js b/www/psensor.js index 5e9d91f..6f4ef7e 100644 --- a/www/psensor.js +++ b/www/psensor.js @@ -168,19 +168,19 @@ function update_menu() { str = ""; - $.getJSON("/api/1.0/sensors", function(data) { + $.getJSON("/api/1.1/sensors", function(data) { str += "
  • Sensors\n"; str += "
  • CPU