Fixed Custom Registration error

3MFConsortium · Jul 19, 2024 · 1c3e445 · 1c3e445
1 parent 21aa856
commit 1c3e445
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 14 deletions.
diff --git a/Include/Common/Platform/NMR_XmlWriter.h b/Include/Common/Platform/NMR_XmlWriter.h
@@ -58,7 +58,7 @@ namespace NMR {
 		virtual void WriteText(_In_ const nfChar * pszContent, _In_ const nfUint32 cbLength) = 0;
 
 		virtual bool GetNamespacePrefix(const std::string &sNameSpaceURI, std::string &sNameSpacePrefix) = 0;
-		virtual void RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix) = 0;
+		virtual void RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix, bool bFailIfExisting) = 0;
 		virtual nfUint32 GetNamespaceCount() = 0;
 		virtual std::string GetNamespacePrefix(nfUint32 nIndex) = 0;
 		virtual std::string GetNamespace(nfUint32 nIndex) = 0;

diff --git a/Include/Common/Platform/NMR_XmlWriter_Native.h b/Include/Common/Platform/NMR_XmlWriter_Native.h
@@ -95,7 +95,7 @@ namespace NMR {
 		virtual void WriteRawLine(_In_ const nfChar * pszRawData, _In_ nfUint32 cbCount);
 
 		virtual bool GetNamespacePrefix(const std::string &sNameSpaceURI, std::string &sNameSpacePrefix);
-		virtual void RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix);
+		virtual void RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix, bool bFailIfExisting);
 		virtual nfUint32 GetNamespaceCount();
 		virtual std::string GetNamespacePrefix(nfUint32 nIndex);
 		virtual std::string GetNamespace(nfUint32 nIndex);

diff --git a/Include/Model/Writer/NMR_ModelWriter.h b/Include/Model/Writer/NMR_ModelWriter.h
@@ -72,7 +72,7 @@ namespace NMR {
 		void assignBinaryStream(const std::string& InstanceUUID, const std::string& sBinaryStreamUUID);
 		CChunkedBinaryStreamWriter* findBinaryStream(const std::string& InstanceUUID, std::string& Path);
 
-		virtual void registerCustomNameSpace(const std::string & sPrefix, const std::string & sNameSpace);
+		virtual void registerCustomNameSpace(const std::string & sPrefix, const std::string & sNameSpace, bool bFailIfExisting);
 
 	};
 

diff --git a/Include/Model/Writer/NMR_ModelWriter_3MF.h b/Include/Model/Writer/NMR_ModelWriter_3MF.h
@@ -67,7 +67,7 @@ namespace NMR {
 
 		void addAdditionalAttachment(_In_ std::string sPath, _In_ PImportStream pStream, _In_ std::string sRelationShipType);
 
-		void registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace) override;
+		void registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace, bool bFailIfExisting) override;
 		std::map<std::string, std::string> getCustomNamespaceMap();
 
 	};

diff --git a/Include/Model/Writer/v100/NMR_ModelWriterNode100_Model.h b/Include/Model/Writer/v100/NMR_ModelWriterNode100_Model.h
@@ -104,7 +104,7 @@ namespace NMR {
 		void registerStreamWriter(const std::string& sInstanceUUID, const std::string& sPath, CChunkedBinaryStreamWriter* pBinaryStreamWriter);
 		void setWriteBinaryExtension(bool bWriteBinaryExtension);
 
-		void registerCustomNamespace (const std::string & sPrefix, const std::string & sNamespace);
+		void registerCustomNamespace (const std::string & sPrefix, const std::string & sNamespace, bool bFailIfExisting);
 
 	};
 

diff --git a/Source/API/lib3mf_writer.cpp b/Source/API/lib3mf_writer.cpp
@@ -323,5 +323,5 @@ void CWriter::RegisterCustomNamespace(const std::string& sPrefix, const std::str
 	if (!NMR::fnStringIsValidAlphanumericNameString (sPrefix))
 		throw ELib3MFInterfaceException(LIB3MF_ERROR_INVALIDNAMESPACEPREFIX);
 
-	m_pWriter->registerCustomNameSpace(sPrefix, sNameSpace);
+	m_pWriter->registerCustomNameSpace(sPrefix, sNameSpace, false);
 }
diff --git a/Source/Common/Platform/NMR_XmlWriter_Native.cpp b/Source/Common/Platform/NMR_XmlWriter_Native.cpp
@@ -344,13 +344,17 @@ namespace NMR {
 		}
 	}
 
-	void CXmlWriter_Native::RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix)
+	void CXmlWriter_Native::RegisterCustomNameSpace(const std::string &sNameSpace, const std::string &sNameSpacePrefix, bool bFailIfExisting)
 	{
 		std::string sDummy;
 		if (GetNamespacePrefix(sNameSpace, sDummy))
 		{
-			throw CNMRException(NMR_ERROR_XMLNAMESPACEALREADYREGISTERED);
+			if (bFailIfExisting)
+				throw CNMRException(NMR_ERROR_XMLNAMESPACEALREADYREGISTERED);
+
+			return;
 		}
+
 		for (auto it = m_sNameSpaces.begin(); it != m_sNameSpaces.end(); ++it)
 			if (it->second == sNameSpacePrefix)
 				throw CNMRException(NMR_ERROR_XMLPREFIXALREADYREGISTERED);

diff --git a/Source/Model/Writer/NMR_ModelWriter.cpp b/Source/Model/Writer/NMR_ModelWriter.cpp
@@ -133,7 +133,7 @@ namespace NMR {
 		m_bAllowBinaryStreams = true;
 	}
 
-	void CModelWriter::registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace)
+	void CModelWriter::registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace, bool bFailIfExisting)
 	{
 		throw CNMRException(NMR_ERROR_WRITERDOESNOTSUPPORTNAMESPACES);
 	}

diff --git a/Source/Model/Writer/NMR_ModelWriter_3MF.cpp b/Source/Model/Writer/NMR_ModelWriter_3MF.cpp
@@ -108,7 +108,7 @@ namespace NMR {
 		for (auto iIter : m_CustomNameSpaces) {
 			std::string sPrefix = iIter.first;
 			std::string sNameSpace = iIter.second;
-			ModelNode.registerCustomNamespace(sPrefix, sNameSpace);
+			ModelNode.registerCustomNamespace(sPrefix, sNameSpace, false);
 		}
 
 		for (auto iAssignmentIter : m_BinaryWriterAssignmentMap) {
@@ -132,7 +132,7 @@ namespace NMR {
 		m_AdditionalAttachments.insert(std::make_pair(sPath, std::make_pair(pStream, sRelationShipType)));
 	}
 
-	void CModelWriter_3MF::registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace)
+	void CModelWriter_3MF::registerCustomNameSpace(const std::string& sPrefix, const std::string& sNameSpace, bool bFailIfExisting)
 	{
 		if (sPrefix.empty ())
 			throw CNMRException(NMR_ERROR_INVALIDPARAM);

diff --git a/Source/Model/Writer/v100/NMR_ModelWriterNode100_Model.cpp b/Source/Model/Writer/v100/NMR_ModelWriterNode100_Model.cpp
@@ -89,7 +89,7 @@ namespace NMR {
 				std::string prefix = "customXMLNS" + std::to_string(m_pXMLWriter->GetNamespaceCount());
 				std::string sDummy;
 				if (!m_pXMLWriter->GetNamespacePrefix(md->getNameSpace(), sDummy)) {
-					m_pXMLWriter->RegisterCustomNameSpace(md->getNameSpace(), prefix);
+					m_pXMLWriter->RegisterCustomNameSpace(md->getNameSpace(), prefix, false);
 				}
 			}
 		}
@@ -924,9 +924,9 @@ namespace NMR {
 		m_bWriteBinaryExtension = bWriteBinaryExtension;
 	}
 
-	void CModelWriterNode100_Model::registerCustomNamespace(const std::string& sPrefix, const std::string& sNamespace)
+	void CModelWriterNode100_Model::registerCustomNamespace(const std::string& sPrefix, const std::string& sNamespace, bool bFailIfExisting)
 	{
-		m_pXMLWriter->RegisterCustomNameSpace(sNamespace, sPrefix);
+		m_pXMLWriter->RegisterCustomNameSpace(sNamespace, sPrefix, bFailIfExisting);
 	}
 
 	void CModelWriterNode100_Model::writeCustomToolpathXMLNode(PCustomXMLNode pXMLNode, const std::string& sPrefix)