Methods for reading data from the BusMessage datatype.

[libplpbus.git] / src / plpbus / BusMessage.cc

diff --git a/src/plpbus/BusMessage.cc b/src/plpbus/BusMessage.cc
index 18fc487496a638a4dd00366fd264ad12c7100ac4..16eaec47fd48faec3b964296d0183e0533e02541 100644 (file)
--- a/src/plpbus/BusMessage.cc
+++ b/src/plpbus/BusMessage.cc
@@ -5,7 +5,11 @@
  *      Author: lamikr
  */
 
+#include <malloc.h>
+#include <omniORB4/CORBA.h>
+
 #include <plp/log.h>
+#include <plp/retval.h>
 
 #include "BusMessage.hh"
 #include "RequestResponseBus.hh"
@@ -15,6 +19,8 @@ using namespace plpbus_orb;
 using namespace plpbus;
 using namespace CORBA;
 
+#define CONST_MSG_ID_KEY_NAME  "_msgtype"
+
 BusMessage::BusMessage() {
        _dataItemSeq    = new DataItemSequence(0);
 }
@@ -36,7 +42,7 @@ BusMessage::BusMessage(long type_param,
 BusMessage::~BusMessage() {
 }
 
-int BusMessage::add_string_parameter(const char *arg_name_param, const char *value_param)
+int BusMessage::add_string_parameter(string arg_name_param, string value_param)
 {
        long                    length;
        int                     ret_val;
@@ -45,15 +51,13 @@ int BusMessage::add_string_parameter(const char *arg_name_param, const char *val
 
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
-       if (arg_name_param != NULL) {
+       if (arg_name_param.empty() == false) {
                length          = seq->length();
                item            = new DataItem();
-               item->name      = strdup(arg_name_param);
-               if (value_param != NULL) {
-                       item->value     <<= strdup(value_param);
-                       seq->length(length + 1);
-                       (*seq)[length]  = *item;
-               }
+               item->name      = strdup(arg_name_param.c_str());
+               item->value     <<= strdup(value_param.c_str());
+               seq->length(length + 1);
+               (*seq)[length]  = *item;
        }
        else {
                ret_val = -1;
@@ -85,7 +89,7 @@ int BusMessage::add_long_parameter(const char *arg_name_param, long value_param)
        return ret_val;
 }
 
-int BusMessage::add_int_parameter(const char *arg_name_param, int value_param)
+int BusMessage::add_int_parameter(string arg_name_param, int value_param)
 {
        long                    length;
        int                     ret_val;
@@ -94,10 +98,10 @@ int BusMessage::add_int_parameter(const char *arg_name_param, int value_param)
 
        ret_val = 0;
        seq     = (DataItemSequence *)_dataItemSeq;
-       if (arg_name_param != NULL) {
+       if (arg_name_param.empty() == false) {
                length          = seq->length();
                item            = new DataItem();
-               item->name      = strdup(arg_name_param);
+               item->name      = strdup(arg_name_param.c_str());
                item->value     <<= (long)value_param;
 
                seq->length(length + 1);
@@ -159,13 +163,124 @@ int BusMessage::add_float_parameter(const char *arg_name_param, float value_para
        return ret_val;
 }
 
+static DataItem *get_dataitem_by_param_name(DataItemSequence *seq, string arg_name_param) {
+       DataItem        *ret_val;
+       long int        count;
+       DataItem        *item;
+       const char      *item_name;
+
+       ret_val = NULL;
+       count   = seq->length();
+       for (long ii = 0; ii < count; ii++) {
+               item            = &(*seq)[ii];
+               item_name       = item->name;
+               if (strcmp(arg_name_param.c_str(), item_name) == 0) {
+                       ret_val = item;
+                       break;
+               }
+       }
+       return ret_val;
+}
+
+long BusMessage::get_type(int *err_flg) {
+       long    ret_val;
+       long    res;
+
+       res     = get_long_parameter(CONST_MSG_ID_KEY_NAME, err_flg);
+       if (*err_flg == PLP_OK) {
+               ret_val = res;
+       }
+       return ret_val;
+}
+
+string BusMessage::get_string_parameter(string arg_name_param, int *err_flg) {
+       string                  ret_val;
+       DataItem                *item;
+       DataItemSequence        *seq;
+       const char              *ch;
+
+       *err_flg        = PLP_ERR_DATA_NOT_FOUND;
+       seq             = (DataItemSequence *)_dataItemSeq;
+       item            = get_dataitem_by_param_name(seq, arg_name_param);
+       if (item != NULL) {
+               item->value >>= CORBA::Any::to_string(ch, 0);
+               ret_val         = ch;
+               *err_flg        = PLP_OK;
+       }
+       return ret_val;
+}
+
+long BusMessage::get_long_parameter(string arg_name_param, int *err_flg) {
+       long                    ret_val;
+       DataItem                *item;
+       DataItemSequence        *seq;
+
+       *err_flg        = PLP_ERR_DATA_NOT_FOUND;
+       seq             = (DataItemSequence *)_dataItemSeq;
+       item            = get_dataitem_by_param_name(seq, arg_name_param);
+       if (item != NULL) {
+               item->value >>= ret_val;
+               *err_flg        = PLP_OK;
+       }
+       return ret_val;
+}
+
+int BusMessage::get_int_parameter(string arg_name_param, int *err_flg) {
+       int                     ret_val;
+       DataItem                *item;
+       DataItemSequence        *seq;
+       long                    tmp;
+
+       *err_flg        = PLP_ERR_DATA_NOT_FOUND;
+       seq             = (DataItemSequence *)_dataItemSeq;
+       item            = get_dataitem_by_param_name(seq, arg_name_param);
+       if (item != NULL) {
+               item->value >>= tmp;
+               ret_val =        (int)tmp;
+               *err_flg        = PLP_OK;
+       }
+       return ret_val;
+}
+
+double BusMessage::get_double_parameter(string arg_name_param, int *err_flg) {
+       double          ret_val;
+       DataItem        *item;
+       DataItemSequence *seq;
+
+       *err_flg        = PLP_ERR_DATA_NOT_FOUND;
+       seq             = (DataItemSequence *)_dataItemSeq;
+       item            = get_dataitem_by_param_name(seq, arg_name_param);
+       if (item != NULL) {
+               item->value >>= ret_val;
+               *err_flg        = PLP_OK;
+       }
+       return ret_val;
+}
+
+float BusMessage::get_float_parameter(string arg_name_param, int *err_flg) {
+       float           ret_val;
+       DataItem        *item;
+       DataItemSequence *seq;
+
+       *err_flg        = PLP_ERR_DATA_NOT_FOUND;
+       seq             = (DataItemSequence *)_dataItemSeq;
+       item            = get_dataitem_by_param_name(seq, arg_name_param);
+       if (item != NULL) {
+               item->value >>= ret_val;
+               *err_flg        = PLP_OK;
+       }
+       return ret_val;
+}
+
 void BusMessage::printout_dataitem(long index, void *item) {
        CORBA::TCKind   kind;
+       const char      *name;
        DataItem        *dataitem;
 
        dataitem        = (DataItem *)item;
        if (item != NULL) {
                if (dataitem->name != NULL) {
+                       name    = dataitem->name;
                        kind    = dataitem->value.type()->kind();
                        switch(kind) {
                                case tk_string:
@@ -173,14 +288,14 @@ void BusMessage::printout_dataitem(long index, void *item) {
                                                const char *val;
 
                                                dataitem->value >>= val;
-                                               log_debug("\t[%ld], value: %s\n", index, val);
+                                               log_debug("\t[%ld] %s: %s\n", index, name, val);
                                        }
                                        break;
                                case tk_long:
                                        {
                                                long    val;
                                                dataitem->value >>= val;
-                                               log_debug("\t[%ld], value: %ld\n", index, val);
+                                               log_debug("\t[%ld] %s: %ld\n", index, name, val);
                                                //val_str       = strdup("long");
                                        }
                                        break;
@@ -188,7 +303,7 @@ void BusMessage::printout_dataitem(long index, void *item) {
                                        {
                                                double val;
                                                dataitem->value >>= val;
-                                               log_debug("\t[%ld], value: %f\n", index, val);
+                                               log_debug("\t[%ld] %s: %f\n", index, name, val);
                                                //val_str       = strdup("double");
                                        }
                                        break;
@@ -196,12 +311,12 @@ void BusMessage::printout_dataitem(long index, void *item) {
                                        {
                                                float val;
                                                dataitem->value >>= val;
-                                               log_debug("\t[l%ld] value: %f\n", index, val);
+                                               log_debug("\t[l%ld] %s: %f\n", index, name, val);
                                                //val_str       = strdup("float");
                                        }
                                        break;
                                default:
-                                       log_error("\t[%ld], value unknown\n", index);
+                                       log_error("\t[%ld], name: %s, value unknown\n", index, name);
                        }
                }
                else {