From 18761a06ce16d100d4633760e2b3b81c86b1c706 Mon Sep 17 00:00:00 2001
From: Matteo Cypriani <matteo.cypriani@univ-fcomte.fr>
Date: Tue, 24 Jul 2012 16:21:03 +0200
Subject: [PATCH] [Positioner] Input: fix calib. request handling

Reorganise the tests in order to really ignore calibration requests if
positioning.accept-new-calibration-requests = false and
positioning.position-calibration-requests = false.

Display a message when a calibration request is ignored.
---
 owlps-positioner/src/input.cc | 37 +++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/owlps-positioner/src/input.cc b/owlps-positioner/src/input.cc
index 54604bb..35d6627 100644
--- a/owlps-positioner/src/input.cc
+++ b/owlps-positioner/src/input.cc
@@ -140,34 +140,37 @@ const Request& Input::get_next_request() const
     Stock::delete_calibration_requests_older_than(cr_timeout) ;
 
   /* If the request is a calibration request, add it to the Stock */
-  if (Configuration::bool_value(
-        "positioning.accept-new-calibration-requests"))
+  CalibrationRequest *calibration_request =
+    dynamic_cast<CalibrationRequest*>(const_cast<Request*>(&request)) ;
+  if (calibration_request != NULL)
     {
-      CalibrationRequest *calibration_request =
-        dynamic_cast<CalibrationRequest*>(
-          const_cast<Request*>(&request)) ;
-      if (calibration_request != NULL)
+      if (Configuration::bool_value(
+        "positioning.accept-new-calibration-requests"))
         {
+          if (Configuration::is_configured("verbose"))
+            cerr
+              << "Got a new calibration request (total "
+              << Stock::nb_calibration_requests() << " in "
+              << Stock::nb_reference_points()
+              << " reference points).\n" ;
+
           if (Configuration::bool_value(
                 "positioning.unique-calibration-requests"))
             calibration_request->reference_point_delete_requests() ;
           Stock::store_calibration_request(*calibration_request) ;
 
-          if (Configuration::is_configured("verbose"))
-            cerr
-                << "Got a new calibration request (total "
-                << Stock::nb_calibration_requests() << " in "
-                << Stock::nb_reference_points()
-                << " reference points).\n" ;
-
           if (Configuration::bool_value(
                 "positioning.generate-reference-points"))
             Stock::regenerate_reference_points() ;
-
-          if (! Configuration::bool_value(
-                "positioning.position-calibration-requests"))
-            medium->clear_current_request() ;
         }
+      else if (Configuration::is_configured("verbose"))
+        cerr
+          << "Ignored new calibration request (positioning."
+          << "accept-new-calibration-requests = false).\n" ;
+
+      if (! Configuration::bool_value(
+                "positioning.position-calibration-requests"))
+        medium->clear_current_request() ;
     }
 
   return medium->get_current_request() ;