X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=server%2Fsensor.c;h=0edb086e0c46876ab77a96744698313409034cd5;hb=ef065a355c92c834adcfa49f866d23ef4153cf36;hp=9e0c266def12e16419d5697801db776c0a8a66e9;hpb=daa632fd405efaf8656efa8f506fc50d1e48ec94;p=matches%2FMCTX3420.git

diff --git a/server/sensor.c b/server/sensor.c
index 9e0c266..0edb086 100644
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -248,8 +248,8 @@ Sensor * Sensor_Identify(const char * id_str)
 /**
  * Helper: Begin sensor response in a given format
  * @param context - the FCGIContext
- * @param format - Format
  * @param id - ID of sensor
+ * @param format - Format
  */
 void Sensor_BeginResponse(FCGIContext * context, SensorId id, DataFormat format)
 {
@@ -300,11 +300,11 @@ void Sensor_Handler(FCGIContext *context, char * params)
 	int id = 0;
 	double start_time = 0;
 	double end_time = current_time;
-	char * fmt_str;
+	const char * fmt_str;
 
 	// key/value pairs
 	FCGIValue values[] = {
-		{"id", &id, FCGI_REQUIRED(FCGI_LONG_T)}, 
+		{"id", &id, FCGI_REQUIRED(FCGI_INT_T)}, 
 		{"format", &fmt_str, FCGI_STRING_T}, 
 		{"start_time", &start_time, FCGI_DOUBLE_T}, 
 		{"end_time", &end_time, FCGI_DOUBLE_T},
@@ -324,20 +324,14 @@ void Sensor_Handler(FCGIContext *context, char * params)
 		// Error occured; FCGI_RejectJSON already called
 		return;
 	}
-
-	// Get Sensor
-	Sensor * s = NULL;
-
-	// Error checking on sensor id
-	if (id < 0 || id >= NUMSENSORS)
-	{
-		Log(LOGERR, "Invalid id %d", id);
-	}
-	else
+	else if (id < 0 || id >= NUMSENSORS)
 	{
-		s = g_sensors+id;
+		FCGI_RejectJSON(context, "Invalid sensor id specified");
+		return;
 	}
-	
+
+	// Get Sensor and format
+	Sensor * s = g_sensors+id;
 	DataFormat format = JSON;
 
 	// Check if format type was specified
@@ -347,17 +341,18 @@ void Sensor_Handler(FCGIContext *context, char * params)
 			format = JSON;
 		else if (strcmp(fmt_str, "tsv") == 0)
 			format = TSV;
-		else
-			Log(LOGERR, "Unknown format type \"%s\"", fmt_str);
+		else 
+		{
+			FCGI_RejectJSON(context, "Unknown format type specified.");
+			return;
+		}
 	}
 
-	
-	
 	// Begin response
 	Sensor_BeginResponse(context, id, format);
 	
 	// If a time was specified
-	if ((s != NULL) && (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags)))
+	if (FCGI_RECEIVED(values[START_TIME].flags) || FCGI_RECEIVED(values[END_TIME].flags))
 	{
 		// Wrap times relative to the current time
 		if (start_time < 0)
@@ -367,13 +362,12 @@ void Sensor_Handler(FCGIContext *context, char * params)
 
 		// Print points by time range
 		Data_PrintByTimes(&(s->data_file), start_time, end_time, format);
-
 	}
-	else if (s != NULL) // No time was specified; just return a recent set of points
+	else // No time was specified; just return a recent set of points
 	{
 		pthread_mutex_lock(&(s->data_file.mutex));
 			int start_index = s->data_file.num_points-DATA_BUFSIZ;
-			int end_index = s->data_file.num_points-1;
+			int end_index = s->data_file.num_points;
 		pthread_mutex_unlock(&(s->data_file.mutex));
 
 		// Bounds check