Fix EPC content types and schema versions

Adjust how schemaVersion and EPC content types are generated and fix minor issues across codebase.

- AbstractObject: add documentation for EML schemaVersion handling and compute gsoapProxy2_3->schemaVersion from the XML namespace (last two chars) instead of using getXmlNamespaceVersion().
- EpcDocument: introduce getEpcContentType(...) to produce EPC content-type strings in the form "application/x-<ns>+xml;version=X.Y;type=<tag>" and use it when adding package content types.
- PropertySet: ensure null-check throw is properly braced to avoid control-flow ambiguity.
- GitHub Actions workflow: correct comment typo referencing the fetpapi wheel.

These changes ensure EPC content types follow the expected two-digit dot-delimited version format and clarify schema version behavior for different Energistics schema versions.

Author: philippeVerney

.github/workflows/github-actions.yml

@@ -166,7 +166,7 @@ jobs:
         # https://github.com/pypa/cibuildwheel/issues/1139
         run: touch python/setup.py
       - name: Build wheels
-        # Cannot use a more recent version than v2.22.0 because of fetappi wheel which uses AVRO which cannot be built with GNU 14.
+        # Cannot use a more recent version than v2.22.0 because of fetpapi wheel which uses AVRO which cannot be built with GNU 14.
         uses: pypa/cibuildwheel@v2.22.0
         env:
           CIBW_BUILD: cp38-manylinux_* cp39-manylinux_* cp310-manylinux_* cp311-manylinux_* cp312-manylinux_* cp313-manylinux_*

src/common/AbstractObject.cpp

@@ -497,11 +497,21 @@ void AbstractObject::initMandatoryMetadata()
 	cannotBePartial();
 
 	if (gsoapProxy2_0_1 != nullptr) {
+		/* From EML2.0 Abstract.xsd, schemaVersion documentation :
+		* The specific version of a schema from which this object is derived.
+		* This string should be exactly equivalent to the version attribute of the root element of the associated XSD schema file
+		*/
 		gsoapProxy2_0_1->schemaVersion = getXmlNamespaceVersion();
 		gsoapProxy2_0_1->Citation = gsoap_resqml2_0_1::soap_new_eml20__Citation(gsoapProxy2_0_1->soap);
 	}
 	else if (gsoapProxy2_3 != nullptr) {
-		gsoapProxy2_3->schemaVersion = getXmlNamespaceVersion();
+		/* From EML2.3 Abstract.xsd, schemaVersion documentation :
+		* The version of the Energistics schema used for a data object. The schema version is the first 2 digits of an ML version. EXAMPLES: 
+		* - For WITSML v2.0 the schema version is 20
+		* - For RESQML v2.0.1 the schema version is 20
+		*/
+		const std::string& xmlNs = getXmlNamespace();
+		gsoapProxy2_3->schemaVersion = xmlNs.substr(xmlNs.size()-2);
 		gsoapProxy2_3->Citation = gsoap_eml2_3::soap_new_eml23__Citation(gsoapProxy2_3->soap);
 	}
 

src/common/AbstractObject.h

@@ -471,7 +471,9 @@ namespace COMMON_NS
 		DLL_IMPORT_OR_EXPORT virtual std::string getXmlNamespaceVersion() const;
 
 		/**
-		 * Gets the content type of this instance according to EPC recommendation
+		 * Gets the content type of this instance according to Energistics Identifier Specification v4.0
+		 * https://docs.energistics.org/#EID/EID_TOPICS/EID-000-007-0-C-sv4000.html
+		 * Example here : https://docs.energistics.org/#EID/EID_TOPICS/EID-000-009-0-C-sv4000.html
 		 *
 		 * @returns	The content type of this instance.
 		 */

src/common/EpcDocument.cpp

@@ -235,6 +235,19 @@ namespace {
 	}
 }
 
+namespace {
+	/**
+	* The version in the EPC content type is just two digits delimited by a dot : https://docs.energistics.org/#EPC/EPC_TOPICS/EPC-000-023-0-C-sv1000.html
+	*/
+	std::string getEpcContentType(const COMMON_NS::AbstractObject& dataobject) {
+		const std::string& xmlNs = dataobject.getXmlNamespace();
+		const size_t xmlNsSize = xmlNs.size();
+		const std::string& xmlTag = dataobject.getXmlTag();
+		return "application/x-" + xmlNs.substr(0, xmlNsSize - 2) + "+xml;version=" + xmlNs[xmlNsSize - 2] + '.' + xmlNs[xmlNsSize - 1] +
+			";type=" + (xmlNs == "resqml20" || xmlNs == "eml20" ? "obj_" + xmlTag : xmlTag);
+	}
+}
+
 void EpcDocument::serializeFrom(DataObjectRepository& repo)
 {
 	addFakePropertyToEmptyPropertySet(repo);
@@ -256,7 +269,7 @@ void EpcDocument::serializeFrom(DataObjectRepository& repo)
 				}
 
 				// Content Type entry
-				package->addContentType(epc::ContentType(false, dataobject->getContentType(), dataobject->getPartNameInEpcDocument()));
+				package->addContentType(epc::ContentType(false, getEpcContentType(*dataobject), dataobject->getPartNameInEpcDocument()));
 			}
 		}
 	}

src/resqml2_0_1/PropertySet.cpp

@@ -72,8 +72,9 @@ PropertySet* PropertySet::getChildren(uint64_t index) const
 
 void PropertySet::pushBackProperty(RESQML2_NS::AbstractProperty * prop)
 {
-	if (prop == nullptr)
+	if (prop == nullptr) {
 		throw invalid_argument("The property to push cannot be null.");
+	}
 
 	pushBackXmlProperty(prop);