do not ship src/Makefile.in

[libplpdevicebus.git] / src_client / DeviceManagerClient.hh

diff --git a/src_client/DeviceManagerClient.hh b/src_client/DeviceManagerClient.hh
index cb88c90c1e4a8a17309ed81e2be19eac4cd7a35b..3da39181290b2b0bd08d32a4b8c131baff079f7c 100644 (file)
--- a/src_client/DeviceManagerClient.hh
+++ b/src_client/DeviceManagerClient.hh
@@ -11,24 +11,48 @@
 #include <list>
 #include <string>
 
+#include <plp/Data.hh>
+#include <plp/Device.hh>
 #include <plp/bus/BusMessage.hh>
 #include <plp/bus/BusClient.hh>
-#include <plp/Device.hh>
+
+using namespace std;
+using namespace plp;
+using namespace plpbus;
 
 namespace plpdevicebus {
        class DeviceManagerClient {
                public:
                        DeviceManagerClient();
                        virtual ~DeviceManagerClient();
-                       const std::list<plp::Device *> *get_device_list(plpbus::BusClient *client_param,
+                       const list<plp::Device *> *get_device_list(plpbus::BusClient *client_param,
+                                               int *err_flg);
+                       Data *get_latest_data(BusClient *client_param,
+                                               string device_id_param,
                                                int *err_flg);
-                       plpbus::BusMessage *get_latest_data(plpbus::BusClient *client_param,
-                                               std::string device_id_param);
+                       DataRange *get_data_range(BusClient *client_param,
+                                               string device_id_param,
+                                               int *err_flg);
+                       DataRange *get_data(BusClient *client_param,
+                                       string device_id_param,
+                                       Date *start_date,
+                                       Date *end_date,
+                                       int *err_flg);
                private:
-                       std::list<plp::Device *>        *_device_list;
-                       //void send_request__get_device_list(plpbus::BusClient *client_param);
+                       list<plp::Device *>     *_device_list;
                        list<plp::Device *> *parse_device_list_msg(plpbus::BusMessage *dev_list_msg_param,
                                                                int *err_flg);
+                       void parse_device_data_msg(BusMessage *msg_param,
+                                               DataRange *result,
+                                               string key,
+                                               int *err_flg,
+                                               string description);
+                       DataRange *parse_device_data_msg(BusMessage *msg_param,
+                                               int *err_flg);
+                       DataRange *parse_first_and_last_data_msg(BusMessage *msg_param,
+                                               int *err_flg);
+                       DataRange *parse_data_range_msg(BusMessage *msg_param,
+                                                       int *err_flg);
        };
 }