Fix TableRange parsing

Benjamin Renard
1 parent d1d8375e
Showing 2 changed files with 37 additions and 2 deletions Show diff stats
src/Info/ParamTable.cc
src/Info/ParamTableNode.cc
@@ -25,7 +25,7 @@ namespace AMDA {
         LoggerPtr ParamTable::_logger(Logger::getLogger("AMDA-Kernel.ParamTable"));
  
         ParamTable::ParamTable(const char *paramId, int dim) : _paramId(paramId), _dim(dim),
-        _tableName(""), _tableUnits(""), _variable("false") {
+        _tableName(""), _tableUnits(""), _variable(false) {
         }
  
         ParamTable::~ParamTable() {
@@ -544,8 +544,39 @@ namespace AMDA {
  
                 std::string paramId = pParamInfo->getId();
  
+                //Get name
+                xmlChar* value = xmlGetProp(pNode, (const xmlChar *) "name");
+                std::string name;
+                if (value != NULL) {
+                    name = (char *) value;
+                    xmlFree(value);
+                }
+
+                //Get units
+                value = xmlGetProp(pNode, (const xmlChar *) "units");
+                std::string units;
+                if (value != NULL) {
+                    units = (char *) value;
+                    xmlFree(value);
+                }
+
+                //Get variable
+                value = xmlGetProp(pNode, (const xmlChar *) "variable");
+                bool variable = false;
+                if (value != NULL) {
+                    variable = (strcmp((char*) value, "true") == 0);
+                    xmlFree(value);
+                }
+                //Get fullVariable
+                value = xmlGetProp(pNode, (const xmlChar *) "fullVariable");
+                bool fullVariable = false;
+                if (value != NULL) {
+                    fullVariable = (strcmp((char*) value, "true") == 0);
+                    xmlFree(value);
+                }
+
                 //Get min
-                xmlChar* value = xmlGetProp(pNode, (const xmlChar *) "min");
+                value = xmlGetProp(pNode, (const xmlChar *) "min");
                 double min = 0.;
                 if (value != NULL) {
                     min = atof((char *) value);
@@ -589,6 +620,10 @@ namespace AMDA {
                 }
  
                 boost::shared_ptr<ParamTable> table(new RangeTable(paramId.c_str(), dim, min, max, step));
+		table->setName(name);
+                table->setUnits(units);
+                table->setIsVariable(variable);
+                table->setIsFullVariable(fullVariable);
  
                 pParamInfo->addTable(dim, table);
             }