Change sensor data transfer

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

diff --git a/server/query.c b/server/query.c
index 7a9ab16..86696bb 100644 (file)
--- a/server/query.c
+++ b/server/query.c
@@ -6,7 +6,7 @@
 
 
 
-
+#include "query.h"
 
 #include "sensor.h"
 #include "log.h"
@@ -25,22 +25,10 @@ void QuerySensor(int id) //TODO: This code will form the SensorHandler FastCGI f
        //CRITICAL SECTION (Don't access file while sensor thread is writing to it!)
        pthread_mutex_lock(&(s->mutex));
 
-               FILE * file = fopen(s->filename, "rb");
-               if (file == NULL)
-               {
-                       Log(LOGWARN, "Couldn't open file \"%s\" mode rb - %s", s->filename, strerror(errno));                   
-               }
-               else
-               {
-                       fseek(file, 0, SEEK_SET);
-                       rewind(file);
-                       amount_read = fread(&buffer, sizeof(DataPoint), QUERY_BUFSIZ, file);
-                       s->read_offset += amount_read;
-                       Log(LOGDEBUG, "Read %d data points; offset now at %d", amount_read, s->read_offset);
-                       
-                       fclose(file);
-               }
-
+               fseek(s->file, -QUERY_BUFSIZ*sizeof(DataPoint), SEEK_END);
+               amount_read = fread(&buffer, sizeof(DataPoint), QUERY_BUFSIZ, s->file);
+               Log(LOGDEBUG, "Read %d data points", amount_read);
+               
        pthread_mutex_unlock(&(s->mutex));
        //End critical section