Tables update implemented

[stg.git] / projects / stargazer / plugins / other / smux / sensors.h

diff --git a/projects/stargazer/plugins/other/smux/sensors.h b/projects/stargazer/plugins/other/smux/sensors.h
index be53762b81d4d67442211b093127c066cdff3803..f284063658251b2d8dd5425e8ef92d84504d17f4 100644 (file)
--- a/projects/stargazer/plugins/other/smux/sensors.h
+++ b/projects/stargazer/plugins/other/smux/sensors.h
@@ -1,28 +1,26 @@
 #ifndef __SENSORS_H__
 #define __SENSORS_H__
 
 #ifndef __SENSORS_H__
 #define __SENSORS_H__
 

-#include <string>

 #include <map>
 
 #include "stg/users.h"
 #include "stg/tariffs.h"
 #include "stg/user_property.h"
 
 #include <map>
 
 #include "stg/users.h"
 #include "stg/tariffs.h"
 #include "stg/user_property.h"
 

-#include "asn1/ObjectSyntax.h"
+#include "stg/ObjectSyntax.h"

 
 #include "value2os.h"
 
 #include "value2os.h"

+#include "types.h"

 
 class Sensor {
     public:
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;
 
 class Sensor {
     public:
         virtual bool GetValue(ObjectSyntax_t * objectSyntax) const = 0;

+#ifdef DEBUG
+        virtual std::string ToString() const = 0;
+#endif

 };
 
 };
 

-typedef std::map<std::string, Sensor *> Sensors;
-
-class TableSensor {
-    public:
-        virtual bool appendTable(Sensors & sensors);
-};
+typedef std::map<OID, Sensor *> Sensors;

 
 class TotalUsersSensor : public Sensor {
     public:
 
 class TotalUsersSensor : public Sensor {
     public:


@@ -35,6 +33,11 @@ class TotalUsersSensor : public Sensor {
         return true;
         }
 
         return true;
         }
 

+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(users.GetUserNum(), res); return res; }
+#endif
+

     private:
         const USERS & users;
 };
     private:
         const USERS & users;
 };


@@ -42,9 +45,12 @@ class TotalUsersSensor : public Sensor {
 class UsersSensor : public Sensor {
     public:
         UsersSensor(USERS & u) : users(u) {}
 class UsersSensor : public Sensor {
     public:
         UsersSensor(USERS & u) : users(u) {}

-        virtual ~UsersSensor() {};
+        virtual ~UsersSensor() {}

 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;
 
         bool GetValue(ObjectSyntax_t * objectSyntax) const;

+#ifdef DEBUG
+        std::string ToString() const;
+#endif

 
     private:
         USERS & users;
 
     private:
         USERS & users;


@@ -163,6 +169,11 @@ class TotalTariffsSensor : public Sensor {
         return true;
         }
 
         return true;
         }
 

+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(tariffs.GetTariffsNum(), res); return res; }
+#endif
+

     private:
         const TARIFFS & tariffs;
 };
     private:
         const TARIFFS & tariffs;
 };


@@ -176,8 +187,20 @@ class ConstSensor : public Sensor {
         bool GetValue(ObjectSyntax * objectSyntax) const
         { return ValueToOS(value, objectSyntax); }
 
         bool GetValue(ObjectSyntax * objectSyntax) const
         { return ValueToOS(value, objectSyntax); }
 

+#ifdef DEBUG
+        std::string ToString() const
+        { std::string res; x2str(value, res); return res; }
+#endif
+

     private:
         T value;
 };
 
     private:
         T value;
 };
 

+template <>
+inline
+std::string ConstSensor<std::string>::ToString() const
+{
+return value;
+}
+

 #endif
 #endif