more use of new xml.lite infrastructure

ngageoint · Dec 10, 2021 · 1a74d40 · 1a74d40
1 parent 5d641a4
commit 1a74d40
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 34 deletions.
diff --git a/six/modules/c++/six/include/six/XMLParser.h b/six/modules/c++/six/include/six/XMLParser.h
@@ -191,10 +191,6 @@ struct XMLParser
     XMLElem createDateTime(const std::string& name,
             const std::string& uri, const DateTime& p, XMLElem parent = nullptr) const;
 
-    XMLElem createDateTime(const std::string& name,
-            const std::string& uri, const std::string& s,
-            XMLElem parent = nullptr) const;
-
     XMLElem createDate(const std::string& name,
             const std::string& uri, const DateTime& p, XMLElem parent = nullptr) const;
 
@@ -227,8 +223,6 @@ struct XMLParser
     XMLElem createBooleanType(const std::string& name, BooleanType b,
             XMLElem parent = nullptr) const;
 
-    XMLElem createDateTime(const std::string& name,
-            const std::string& s, XMLElem parent = nullptr) const;
     XMLElem createDate(const std::string& name, const DateTime& p,
             XMLElem parent = nullptr) const;
 

diff --git a/six/modules/c++/six/source/XMLParser.cpp b/six/modules/c++/six/source/XMLParser.cpp
@@ -155,17 +155,6 @@ XMLElem XMLParser::createBooleanType(const std::string& name, BooleanType p,
     return mXmlLite.createBooleanType(name, p, parent);
 }
 
-XMLElem XMLParser::createDateTime(const std::string& name,
-        const std::string& uri, const std::string& s, XMLElem parent) const
-{
-    return mXmlLite.createDateTime(name, uri, s, parent);
-}
-XMLElem XMLParser::createDateTime(const std::string& name,
-        const std::string& s, XMLElem parent) const
-{
-    return mXmlLite.createDateTime(name, s, parent);
-}
-
 XMLElem XMLParser::createDateTime(const std::string& name,
         const std::string& uri, const DateTime& p, XMLElem parent) const
 {

diff --git a/six/modules/c++/six/source/XmlLite.cpp b/six/modules/c++/six/source/XmlLite.cpp
@@ -153,12 +153,12 @@ inline std::string toString_(const std::string& name, const T& v, const xml::lit
     return toString(name, v, &parent);
 }
 
-template<typename T>
+template<typename T, typename ToString>
 static xml::lite::Element& createValue(const std::string& name, const std::string& uri,
     const T& v, xml::lite::Element& parent,
-    bool addClassAttributes, const std::string& type, const std::string& attributeUri)
+    bool addClassAttributes, const std::string& type, const std::string& attributeUri,
+    ToString toString)
 {
-    const auto toString = [&](const T& v) { return toString_(name, v, parent); };
     auto& elem = xml::lite::createElement(name, uri, v, parent, toString);
     if (addClassAttributes)
     {
@@ -167,6 +167,14 @@ static xml::lite::Element& createValue(const std::string& name, const std::strin
 
     return elem;
 }
+template<typename T>
+inline xml::lite::Element& createValue(const std::string& name, const std::string& uri,
+    const T& v, xml::lite::Element& parent,
+    bool addClassAttributes, const std::string& type, const std::string& attributeUri)
+{
+    const auto toString = [&](const T& v) { return toString_(name, v, parent); };
+    return createValue(name, uri, v, parent, addClassAttributes, type, attributeUri, toString);
+}
 
 template<typename T>
 static xml::lite::Element* createOptionalValue(const std::string& name, const std::string& uri,
@@ -249,11 +257,11 @@ xml::lite::Element* XmlLite::createBooleanType(const std::string& name,
         return nullptr;
     }
 
-    xml::lite::Element* const elem =
-            newElement(name, uri, six::toString(p), parent);
-    addClassAttributes(*elem, "xs:boolean");
-
-    return elem;
+    assert(parent != nullptr);
+    const auto toString = [&](const BooleanType& v) { return six::toString(v); };
+    return &createValue(name, uri, p, *parent,
+        mAddClassAttributes, "xs:boolean", getDefaultURI(),
+        toString);
 }
 xml::lite::Element* XmlLite::createBooleanType(const std::string& name, BooleanType p,
         xml::lite::Element* parent) const
@@ -264,21 +272,24 @@ xml::lite::Element* XmlLite::createBooleanType(const std::string& name, BooleanT
 xml::lite::Element* XmlLite::createDateTime(const std::string& name,
         const std::string& uri, const std::string& s, xml::lite::Element* parent) const
 {
-    xml::lite::Element* elem = newElement(name, uri, s, parent);
-    addClassAttributes(*elem, "xs:dateTime");
-
-    return elem;
+    assert(parent != nullptr);
+    return &createValue(name, uri, s, *parent,
+        mAddClassAttributes, "xs:dateTime", getDefaultURI());
 }
 xml::lite::Element* XmlLite::createDateTime(const std::string& name,
         const std::string& s, xml::lite::Element* parent) const
 {
     return createDateTime(name, mDefaultURI, s, parent);
 }
-
 xml::lite::Element* XmlLite::createDateTime(const std::string& name,
         const std::string& uri, const DateTime& p, xml::lite::Element* parent) const
 {
-    return createDateTime(name, uri, six::toString(p), parent);
+    assert(parent != nullptr);
+
+    const auto toString = [&](const DateTime& v) { return six::toString(v); };
+    return &createValue(name, uri, p, *parent,
+        mAddClassAttributes, "xs:dateTime", getDefaultURI(),
+        toString);
 }
 xml::lite::Element* XmlLite::createDateTime(const std::string& name, const DateTime& p,
         xml::lite::Element* parent) const
@@ -289,9 +300,12 @@ xml::lite::Element* XmlLite::createDateTime(const std::string& name, const DateT
 xml::lite::Element* XmlLite::createDate(const std::string& name,
         const std::string& uri, const DateTime& p, xml::lite::Element* parent) const
 {
-    xml::lite::Element* const elem = newElement(name, uri, p.format("%Y-%m-%d"), parent);
-    addClassAttributes(*elem, "xs:date");
-    return elem;
+    assert(parent != nullptr);
+
+    const auto toString = [&](const DateTime& p) { return p.format("%Y-%m-%d"); };
+    return &createValue(name, uri, p, *parent,
+        mAddClassAttributes, "xs:date", getDefaultURI(),
+        toString);
 }
 xml::lite::Element* XmlLite::createDate(const std::string& name, const DateTime& p,
         xml::lite::Element* parent) const