From 792357cb81ffa8b2f4fe5c16b1e359d8e51a53ae Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Wed, 18 Feb 2015 16:33:35 +0100
Subject: changed cardinality toString conversion to be reparseable as
 cardinality.

---
 src/core/common/VariantConverter.cpp      | 4 ++--
 test/core/common/VariantConverterTest.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/common/VariantConverter.cpp b/src/core/common/VariantConverter.cpp
index a9ca467..b43d04e 100644
--- a/src/core/common/VariantConverter.cpp
+++ b/src/core/common/VariantConverter.cpp
@@ -262,7 +262,7 @@ bool VariantConverter::toString(Variant &var, Logger &logger, Mode mode)
 				// Print cardinality syntax
 				Variant::cardinalityType card = var.asCardinality();
 				std::stringstream ss;
-				ss << "<cardinality {";
+				ss << "{";
 				bool first = true;
 				for (Variant::rangeType r : card.getRanges()) {
 					if (first) {
@@ -288,7 +288,7 @@ bool VariantConverter::toString(Variant &var, Logger &logger, Mode mode)
 						ss << ">" << std::to_string(r.start - 1);
 					}
 				}
-				ss << "}>";
+				ss << "}";
 				var = ss.str().c_str();
 				return true;
 			}
diff --git a/test/core/common/VariantConverterTest.cpp b/test/core/common/VariantConverterTest.cpp
index 9654a7b..2860777 100644
--- a/test/core/common/VariantConverterTest.cpp
+++ b/test/core/common/VariantConverterTest.cpp
@@ -244,7 +244,7 @@ TEST(VariantConverter, toString)
 	                       VariantConverter::Mode::ALL, logger);
 	assertStringConversion(M, "{\"b\":true,\"d\":2.7,\"i\":6,\"s\":\"test\"}",
 	                       true, VariantConverter::Mode::ALL, logger);
-	assertStringConversion(C, "<cardinality {2-4, >6}>", true,
+	assertStringConversion(C, "{2-4, >6}", true,
 	                       VariantConverter::Mode::ALL, logger);
 }
 
-- 
cgit v1.2.3