new schema formats due to changes on rexs.info

Author: Indenbirken, Marcel IT/HZA-TT

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Spelling error in CMakeLists.txt corrected.
 
+### Changed
+
+- Changed to new schema format on REXS hp
+
 ## [2.1.0]
 
 ### Fixed

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22)
-project(rexsapi VERSION 2.1.0 LANGUAGES CXX)
+project(rexsapi VERSION 2.2.0 LANGUAGES CXX)
 
 include(FetchContent)
 

include/rexsapi/ModelLoader.hxx

@@ -30,7 +30,7 @@ namespace rexsapi
    * @brief Creates a model registry containing all models found in the given filesystem path.
    *
    * The filesystem path should contain REXS database model files for different versions and languages. Additionally,
-   * the XML database model schema file (*rexs-dbmodel.xsd*) has to be available in the path.
+   * the XML database model schema file (*rexs-schema.xsd*) has to be available in the path.
    *
    * @param path The filesystem path to load REXS database model files from.
    * @return database::TModelRegistry containing all available REXS database models
@@ -59,9 +59,9 @@ namespace rexsapi
      *
      * @param databasePath filesystem path containing REXS database model files for different versions and languages and
      * all relevant schema files. The necessary schema files are:
-     * - rexs-dbmodel.xsd
      * - rexs-schema.xsd
-     * - rexs-schema.json
+     * - rexs-file.xsd
+     * - rexs-file.json
      * @param dataSourceResolver Will be used to load external model data sources if set. Triggers an error if not set
      *                           and model has external references.
      * @throws TException if the model registry or the schema validators cannot be created
@@ -80,9 +80,9 @@ namespace rexsapi
      *
      * @param databasePath filesystem path containing REXS database model files for different versions and languages and
      * all relevant schema files. The necessary schema files are:
-     * - rexs-dbmodel.xsd
      * - rexs-schema.xsd
-     * - rexs-schema.json
+     * - rexs-file.xsd
+     * - rexs-file.json
      * @param customExtensionMappings Additional custom extension mappings to respect for REXS model file type detection
      * @param dataSourceResolver Will be used to load external model data sources if set. Triggers an error if not set
      *                           and model has external references.
@@ -199,7 +199,7 @@ namespace rexsapi
 
   static inline database::TModelRegistry createModelRegistry(const std::filesystem::path& path)
   {
-    TFileXsdSchemaLoader schemaLoader{path / "rexs-dbmodel.xsd"};
+    TFileXsdSchemaLoader schemaLoader{path / "rexs-schema.xsd"};
     database::TFileResourceLoader resourceLoader{path};
     database::TXmlModelLoader modelLoader{resourceLoader, schemaLoader};
     return database::TModelRegistry::createModelRegistry(modelLoader).first;
@@ -257,13 +257,13 @@ namespace rexsapi
 
   inline TXSDSchemaValidator TModelLoader::createXMLSchemaValidator(const std::filesystem::path& path)
   {
-    TFileXsdSchemaLoader schemaLoader{path / "rexs-schema.xsd"};
+    TFileXsdSchemaLoader schemaLoader{path / "rexs-file.xsd"};
     return TXSDSchemaValidator{schemaLoader};
   }
 
   inline TJsonSchemaValidator TModelLoader::createJsonSchemaValidator(const std::filesystem::path& path)
   {
-    TFileJsonSchemaLoader schemaLoader{path / "rexs-schema.json"};
+    TFileJsonSchemaLoader schemaLoader{path / "rexs-file.json"};
     return TJsonSchemaValidator{schemaLoader};
   }
 

include/rexsapi/XSDSchemaValidator.hxx

@@ -865,10 +865,10 @@ namespace rexsapi
     auto type1 = std::make_unique<detail::TPodType<detail::TStringType>>(fmt::format("{}:string", detail::xsdSchemaNS));
     m_Types.try_emplace(type1->getName(), std::move(type1));
     auto type2 =
-      std::make_unique<detail::TPodType<detail::TIntegerType>>(fmt::format("{}:integer", detail::xsdSchemaNS));
+      std::make_unique<detail::TPodType<detail::TIntegerType>>(fmt::format("{}:int", detail::xsdSchemaNS));
     m_Types.try_emplace(type2->getName(), std::move(type2));
     auto type3 =
-      std::make_unique<detail::TPodType<detail::TDecimalType>>(fmt::format("{}:decimal", detail::xsdSchemaNS));
+      std::make_unique<detail::TPodType<detail::TDecimalType>>(fmt::format("{}:double", detail::xsdSchemaNS));
     m_Types.try_emplace(type3->getName(), std::move(type3));
     auto type4 =
       std::make_unique<detail::TPodType<detail::TBooleanType>>(fmt::format("{}:boolean", detail::xsdSchemaNS));
@@ -926,9 +926,10 @@ namespace rexsapi
 
     for (const auto& element :
          node.select_nodes(fmt::format("{0}:complexType/{0}:sequence/{0}:element", detail::xsdSchemaNS).c_str())) {
-      auto min = convertToUint64(element.node().attribute("minOccurs").as_string());
+      auto minString = std::string(element.node().attribute("minOccurs").as_string());
+      auto min = (minString=="") ? 1  : convertToUint64(minString);
       auto maxString = std::string(element.node().attribute("maxOccurs").as_string());
-      auto max = maxString == "unbounded" ? std::numeric_limits<uint64_t>::max() : convertToUint64(maxString);
+      auto max = (maxString=="") ? 1 : (maxString == "unbounded" ? std::numeric_limits<uint64_t>::max() : convertToUint64(maxString));
 
       if (const auto refName = element.node().attribute("ref"); !refName.empty()) {
         const detail::TElement& ref = findOrRegisterElement(refName.as_string());

include/rexsapi/database/XMLModelLoader.hxx

@@ -91,25 +91,25 @@ namespace rexsapi::database
         return;
       }
 
-      const auto rexsModel = *doc.select_nodes("/rexsModel").begin();
+      const auto rexsModel = *doc.select_nodes("/rexsSchema").begin();
       TModel model{TRexsVersion{rexsapi::detail::getStringAttribute(rexsModel, "version")},
                    rexsapi::detail::getStringAttribute(rexsModel, "language"),
                    rexsapi::detail::getStringAttribute(rexsModel, "date"),
                    statusFromString(rexsapi::detail::getStringAttribute(rexsModel, "status"))};
 
-      for (const auto& node : doc.select_nodes("/rexsModel/units/unit")) {
+      for (const auto& node : doc.select_nodes("/rexsSchema/units/unit")) {
         auto id = convertToUint64(rexsapi::detail::getStringAttribute(node, "id"));
         auto name = rexsapi::detail::getStringAttribute(node, "name");
         model.addUnit(TUnit{id, name});
       }
 
-      for (const auto& node : doc.select_nodes("/rexsModel/valueTypes/valueType")) {
+      for (const auto& node : doc.select_nodes("/rexsSchema/valueTypes/valueType")) {
         auto id = convertToUint64(rexsapi::detail::getStringAttribute(node, "id"));
         auto name = rexsapi::detail::getStringAttribute(node, "name");
         model.addType(id, typeFromString(name));
       }
 
-      for (const auto& node : doc.select_nodes("/rexsModel/attributes/attribute")) {
+      for (const auto& node : doc.select_nodes("/rexsSchema/attributes/attribute")) {
         auto attributeId = rexsapi::detail::getStringAttribute(node, "attributeId");
         auto name = rexsapi::detail::getStringAttribute(node, "name");
         auto valueType =
@@ -137,14 +137,14 @@ namespace rexsapi::database
       }
 
       std::vector<std::pair<std::string, std::string>> attributeMappings;
-      for (const auto& node : doc.select_nodes("/rexsModel/componentAttributeMappings/componentAttributeMapping")) {
+      for (const auto& node : doc.select_nodes("/rexsSchema/componentAttributeMappings/componentAttributeMapping")) {
         auto componentId = rexsapi::detail::getStringAttribute(node, "componentId");
         auto attributeId = rexsapi::detail::getStringAttribute(node, "attributeId");
         attributeMappings.emplace_back(componentId, attributeId);
       }
       rexsapi::database::detail::TComponentAttributeMapper attributeMapper{model, std::move(attributeMappings)};
 
-      for (const auto& node : doc.select_nodes("/rexsModel/components/component")) {
+      for (const auto& node : doc.select_nodes("/rexsSchema/components/component")) {
         auto id = rexsapi::detail::getStringAttribute(node, "componentId");
         auto name = rexsapi::detail::getStringAttribute(node, "name");
         auto attributes = attributeMapper.getAttributesForComponent(id);