Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
8d178a73
Commit
8d178a73
authored
Aug 22, 2019
by
Michael Ott
Browse files
Fix parsing of groups embedded in entity templates
parent
4110c1e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
dcdbpusher/includes/ConfiguratorTemplate.h
View file @
8d178a73
...
...
@@ -535,10 +535,10 @@ protected:
SGroup
*
group
=
new
SGroup
(
val
.
second
.
data
());
if
(
readSensorGroup
(
*
group
,
val
.
second
))
{
group
->
setEntity
(
&
sEntity
);
auto
ret
=
_templateSensorGroups
.
insert
(
std
::
pair
<
std
::
string
,
SGroup
*>
(
val
.
second
.
data
(),
group
));
auto
ret
=
_templateSensorGroups
.
insert
(
std
::
pair
<
std
::
string
,
SGroup
*>
(
sEntity
.
getName
()
+
"::"
+
group
->
getGroupName
(),
group
));
if
(
!
ret
.
second
)
{
LOG
(
warning
)
<<
"Template "
<<
_groupName
<<
" "
<<
val
.
second
.
data
()
<<
" already exists! Omitting..."
;
<<
sEntity
.
getName
()
+
"::"
+
group
->
getGroupName
()
<<
" already exists! Omitting..."
;
delete
group
;
}
}
else
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment