Merge pull request #32 from jtanx/master

[matches/MCTX3420.git] / server / sensor.c

diff --git a/server/sensor.c b/server/sensor.c
index bcf1fcf..f2c73c5 100644 (file)
--- a/server/sensor.c
+++ b/server/sensor.c
@@ -35,7 +35,7 @@ DataPoint * GetData(SensorId sensor_id, DataPoint * d)
        
        struct timeval t;
        gettimeofday(&t, NULL);
-       d->time_stamp = (t.tv_sec - g_options.start_time.tv_sec) + 1e-6*(t.tv_usec - g_options.start_time.tv_usec);
+       d->time_stamp = TIMEVAL_DIFF(t, g_options.start_time);
 
        // Make time relative
        //d->time_stamp.tv_sec -= g_options.start_time.tv_sec;
@@ -385,11 +385,23 @@ void Sensor_Handler(FCGIContext *context, char * params)
 
        double start_time = -1;
        double end_time = -1;
+       double current_time = TIMEVAL_DIFF(now, g_options.start_time)
        bool seek_time = false;
+       bool points_specified = false;
        int query_size = SENSOR_QUERYBUFSIZ;
        int start_index = -1;
        int end_index = -1;
 
+       /* //Possible use case?
+       FCGIValue values[5] = {
+               {"id", &id, FCGI_REQUIRED(FCGI_INT_T)},
+               {"format", &format, FCGI_STRING_T},
+               {"points", &points, FCGI_STRING_T},
+               {"start_time", &start_time, FCGI_DOUBLE_T},
+               {"end_time", &end_time, FCGI_DOUBLE_T}
+       };
+       if (!FCGI_ParseRequest(context, params, values, 5))
+               return;*/
 
        while ((params = FCGI_KeyPair(params, &key, &value)) != NULL)
        {
@@ -428,6 +440,7 @@ void Sensor_Handler(FCGIContext *context, char * params)
                }
                else if (strcmp(key, "points") == 0)
                {
+                       points_specified = true;
                        if (strcmp(value, "all") == 0)
                        {
                                query_size = sensor->points_written;
@@ -456,6 +469,13 @@ void Sensor_Handler(FCGIContext *context, char * params)
                                status = STATUS_ERROR;
                                break;
                        }                       
+
+                       // Treat negative values as being relative to the current time
+                       if (start_time < 0)
+                       {
+                               start_time = current_time + start_time;
+                       }
+                       start_time = floor(start_time);
                }
                else if (strcmp(key, "end_time") == 0)
                {
@@ -467,7 +487,14 @@ void Sensor_Handler(FCGIContext *context, char * params)
                                Log(LOGERR, "Require a double: %s = %s", key, value);
                                status = STATUS_ERROR;
                                break;
-                       }                       
+                       }       
+
+                       // Treat negative values as being relative to the current time
+                       if (end_time < 0)
+                       {
+                               end_time = current_time + end_time;
+                       }               
+                       end_time = ceil(end_time);
                }
                // For backward compatability:
                else if (strcmp(key, "dump") == 0)
@@ -498,13 +525,13 @@ void Sensor_Handler(FCGIContext *context, char * params)
 
        if (seek_time)
        {
-               if (end_time < 0)
+               if (end_time < 0 && !points_specified)
                        end_index = sensor->points_written;
                else
                {
                        int count = 0; DataPoint d;
                        end_index = FindTime(sensor, end_time, &count, &d);
-                       //Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", end_time, d.time_stamp, d.value, count, sensor->id, end_index);
+                       Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", end_time, d.time_stamp, d.value, count, sensor->id, end_index);
                }
                if (start_time < 0)
                        start_time = 0;
@@ -512,8 +539,11 @@ void Sensor_Handler(FCGIContext *context, char * params)
                {
                        int count = 0; DataPoint d;
                        start_index = FindTime(sensor, start_time, &count, &d);
-                       //Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", start_time, d.time_stamp, d.value, count, sensor->id, start_index);
+                       Log(LOGDEBUG, "FindTime - Looked for %f; found [%f,%f] after %d iterations; sensor %d, position %d", start_time, d.time_stamp, d.value, count, sensor->id, start_index);
                }
+
+               if (points_specified)
+                       end_index = start_index + query_size;
        }
        else
        {