From 76c0571d56c2b1346aa8bf1548221ec6f742afbf Mon Sep 17 00:00:00 2001
From: Jan Travnicek <Jan.Travnicek@fit.cvut.cz>
Date: Tue, 26 Aug 2014 22:17:19 +0200
Subject: [PATCH] fix parsing XML representation of LabelSetLabel
---
alib2data/src/label/LabelFromXMLParser.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/alib2data/src/label/LabelFromXMLParser.cpp b/alib2data/src/label/LabelFromXMLParser.cpp
index e493cb332f..1aa0dabe80 100644
--- a/alib2data/src/label/LabelFromXMLParser.cpp
+++ b/alib2data/src/label/LabelFromXMLParser.cpp
@@ -12,7 +12,7 @@
namespace label {
Label LabelFromXMLParser::parseLabel(std::list<sax::Token>& input) const {
- return parseLabel(input, std::set<FEATURES>({FEATURES::STRING, FEATURES::CHAR, FEATURES::INTEGER}));
+ return parseLabel(input, std::set<FEATURES>({FEATURES::STRING, FEATURES::CHAR, FEATURES::INTEGER, FEATURES::LABEL_SET}));
}
Label LabelFromXMLParser::parseLabel(std::list<sax::Token>& input, const std::set<FEATURES>& features) const {
@@ -27,7 +27,7 @@ Label LabelFromXMLParser::parseLabel(std::list<sax::Token>& input, const std::se
return Label(parseCharacterLabel(input));
} else if(isToken(input, sax::Token::TokenType::START_ELEMENT, "LabelSetLabel")) {
if(!features.count(FEATURES::LABEL_SET)) throw exception::AlibException();
- return Label(parseCharacterLabel(input));
+ return Label(parseLabelSetLabel(input));
} else {
throw sax::ParserException(sax::Token("IntegerLabel, StringLabel, CharacterLabel", sax::Token::TokenType::START_ELEMENT), input.front());
}
--
GitLab