From 311e85cdab091de850dc6c6231b25dfcf0723b13 Mon Sep 17 00:00:00 2001
From: gscalamera <graziano.scalamera@elettra.eu>
Date: Fri, 10 Mar 2017 09:50:46 +0100
Subject: [PATCH] Alarm name equal to dynamic attribute name
---
src/Alarm.cpp | 2 ++
src/alarm_grammar.h | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Alarm.cpp b/src/Alarm.cpp
index bd604ab..6823e91 100644
--- a/src/Alarm.cpp
+++ b/src/Alarm.cpp
@@ -2310,6 +2310,7 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
if(!alm.name.empty())
{
alm.attr_name = alm.name;
+#if 0
size_t start_pos = 0;
string from("/");
string to("__");
@@ -2318,6 +2319,7 @@ void Alarm::load_alarm(string alarm_string, alarm_t &alm, vector<string> &evn)
alm.attr_name.replace(start_pos, from.length(), to);
start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
}
+#endif
}
//std::transform(alm.formula.begin(), alm.formula.end(), alm.formula.begin(), (int(*)(int))tolower); //transform to lowercase: incorrect, state has to be written uppercase
std::transform(alm.lev.begin(), alm.lev.end(), alm.lev.begin(), (int(*)(int))tolower); //transform to lowercase
diff --git a/src/alarm_grammar.h b/src/alarm_grammar.h
index 0b2a578..fd9806c 100644
--- a/src/alarm_grammar.h
+++ b/src/alarm_grammar.h
@@ -177,7 +177,7 @@ struct alarm_parse : public grammar<alarm_parse>
expression
= discard_node_d
[
- name
+ name_alm
[
assign_a(self.m_alarm.name) //save name in alarm_t
]
--
GitLab