From d7973a3ef0344e24449c9127336319ddbcdad997 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Tue, 8 Jun 2010 15:18:21 +0200
Subject: [PATCH] [Positioning] InputCSV: Fix CalibrationRequest handling

We now consider a Request as a CalibrationRequest if the Direction field
is valid. We do not take care of the position fields any more.
---
 owlps-positioning/src/inputcsv.cc | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/owlps-positioning/src/inputcsv.cc b/owlps-positioning/src/inputcsv.cc
index 474476b..d892199 100644
--- a/owlps-positioning/src/inputcsv.cc
+++ b/owlps-positioning/src/inputcsv.cc
@@ -54,19 +54,14 @@ const Request& InputCSV::get_next_request()
   current_request->set_time_sent(Timestamp(timestamp_ms)) ;
 
   // Read position fields
-  bool is_calibration_request = false ;
   float pos[3] ;
   for (int i = 0 ; i < 3 ; ++i)
-    {
-      if (! file.read_field(pos[i]))
-        {
-          // Wrong number of fields: blank current request
-          current_request->clear() ;
-          return *current_request ;
-        }
-      if (pos[i] != 0)
-        is_calibration_request = true ;
-    }
+    if (! file.read_field(pos[i]))
+      {
+        // Wrong number of fields: blank current request
+        current_request->clear() ;
+        return *current_request ;
+      }
 
   // Read direction field
   Direction direction ;
@@ -78,10 +73,7 @@ const Request& InputCSV::get_next_request()
       return *current_request ;
     }
   if (direction_int != 0)
-    {
-      is_calibration_request = true ;
-      direction = direction_int ;
-    }
+    direction = direction_int ;
 
   // Reading {MAC_AP;SS} couples
   unordered_map<string, Measurement> measurements ;
@@ -103,7 +95,8 @@ const Request& InputCSV::get_next_request()
 
   current_request->set_measurements(measurements) ;
 
-  if (is_calibration_request)
+  // If the direction is valid, it means we have a CalibrationRequest
+  if (direction)
     {
       current_request_to_calibration_request() ;
       CalibrationRequest *request =