Merged marshalling/unmarshalling methods into core interface.

[shibboleth/cpp-xmltooling.git] / xmltooling / AbstractDOMCachingXMLObject.cpp

diff --git a/xmltooling/AbstractDOMCachingXMLObject.cpp b/xmltooling/AbstractDOMCachingXMLObject.cpp
index 0b9f064..fb4c0f5 100644 (file)
--- a/xmltooling/AbstractDOMCachingXMLObject.cpp
+++ b/xmltooling/AbstractDOMCachingXMLObject.cpp
@@ -21,8 +21,10 @@
  */\r
 \r
 #include "internal.h"\r
-#include "exceptions.h"\r
 #include "AbstractDOMCachingXMLObject.h"\r
+#include "exceptions.h"\r
+#include "XMLObjectBuilder.h"\r
+#include "util/XMLHelper.h"\r
 \r
 #include <algorithm>\r
 #include <functional>\r
@@ -38,63 +40,106 @@ AbstractDOMCachingXMLObject::~AbstractDOMCachingXMLObject()
         m_document->release();\r
 }\r
 \r
-void AbstractDOMCachingXMLObject::releaseDOM()\r
+void AbstractDOMCachingXMLObject::setDOM(DOMElement* dom, bool bindDocument) const\r
 {\r
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".DOM");\r
-    if (log.isDebugEnabled())\r
-        log.debug("Releasing cached DOM reprsentation for %s", getElementQName().toString().c_str());\r
-\r
-    // We don't get rid of the document we're holding, if any.\r
-    // The marshalling process deals with that.\r
-    setDOM(NULL);\r
+    m_dom=dom;\r
+    if (dom) {\r
+        if (bindDocument) {\r
+            setDocument(dom->getOwnerDocument());\r
+        }\r
+    }\r
 }\r
 \r
-void AbstractDOMCachingXMLObject::releaseParentDOM(bool propagateRelease)\r
+void AbstractDOMCachingXMLObject::releaseDOM() const\r
 {\r
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".DOM");\r
-    if (log.isDebugEnabled()) {\r
-        log.debug(\r
-            "Releasing cached DOM representation for parent of %s with propagation set to %s",\r
-            getElementQName().toString().c_str(), propagateRelease ? "true" : "false"\r
-            );\r
+    if (m_dom) {\r
+        Category& log=Category::getInstance(XMLTOOLING_LOGCAT".DOM");\r
+        if (log.isDebugEnabled()) {\r
+            string qname=getElementQName().toString();\r
+            log.debug("releasing cached DOM representation for (%s)", qname.empty() ? "unknown" : qname.c_str());\r
+        }\r
+        setDOM(NULL);\r
     }\r
+}\r
 \r
+void AbstractDOMCachingXMLObject::releaseParentDOM(bool propagateRelease) const\r
+{\r
     DOMCachingXMLObject* domCachingParent = dynamic_cast<DOMCachingXMLObject*>(getParent());\r
     if (domCachingParent) {\r
-        domCachingParent->releaseDOM();\r
-        if (propagateRelease)\r
-            domCachingParent->releaseParentDOM(propagateRelease);\r
+        if (domCachingParent->getDOM()) {\r
+            Category::getInstance(XMLTOOLING_LOGCAT".DOM").debug(\r
+                "releasing cached DOM representation for parent object with propagation set to %s",\r
+                propagateRelease ? "true" : "false"\r
+                );\r
+            domCachingParent->releaseDOM();\r
+            if (propagateRelease)\r
+                domCachingParent->releaseParentDOM(propagateRelease);\r
+        }\r
     }\r
 }\r
 \r
 class _release : public binary_function<XMLObject*,bool,void> {\r
 public:\r
     void operator()(XMLObject* obj, bool propagate) const {\r
-        DOMCachingXMLObject* domCachingParent = dynamic_cast<DOMCachingXMLObject*>(obj);\r
-        if (domCachingParent) {\r
-            domCachingParent->releaseDOM();\r
+        DOMCachingXMLObject* domCaching = dynamic_cast<DOMCachingXMLObject*>(obj);\r
+        if (domCaching) {\r
+            domCaching->releaseDOM();\r
             if (propagate)\r
-                domCachingParent->releaseChildrenDOM(propagate);\r
+                domCaching->releaseChildrenDOM(propagate);\r
         }\r
     }\r
 };\r
 \r
-void AbstractDOMCachingXMLObject::releaseChildrenDOM(bool propagateRelease)\r
+void AbstractDOMCachingXMLObject::releaseChildrenDOM(bool propagateRelease) const\r
 {\r
-    Category& log=Category::getInstance(XMLTOOLING_LOGCAT".DOM");\r
-    if (log.isDebugEnabled()) {\r
-        log.debug(\r
-            "Releasing cached DOM representation for children of %s with propagation set to %s",\r
-            getElementQName().toString().c_str(), propagateRelease ? "true" : "false"\r
+    if (hasChildren()) {\r
+        Category::getInstance(XMLTOOLING_LOGCAT".DOM").debug(\r
+            "releasing cached DOM representation for children with propagation set to %s",\r
+            propagateRelease ? "true" : "false"\r
             );\r
+        for_each(m_children.begin(),m_children.end(),bind2nd(_release(),propagateRelease));\r
+    }\r
+}\r
+\r
+DOMElement* AbstractDOMCachingXMLObject::cloneDOM(DOMDocument* doc) const\r
+{\r
+    if (getDOM()) {\r
+        if (!doc)\r
+            doc=DOMImplementationRegistry::getDOMImplementation(NULL)->createDocument();\r
+        return static_cast<DOMElement*>(doc->importNode(getDOM(),true));\r
+    }\r
+    return NULL;\r
+}\r
+\r
+XMLObject* AbstractDOMCachingXMLObject::clone() const\r
+{\r
+    // See if we can clone via the DOM.\r
+    DOMElement* domCopy=cloneDOM();\r
+    if (domCopy) {\r
+        // Seemed to work, so now we unmarshall the DOM to produce the clone.\r
+        const XMLObjectBuilder* b=XMLObjectBuilder::getBuilder(domCopy);\r
+        if (!b) {\r
+            auto_ptr<QName> q(XMLHelper::getNodeQName(domCopy));\r
+            Category::getInstance(XMLTOOLING_LOGCAT".DOM").error(\r
+                "DOM clone failed, unable to locate builder for element (%s)", q->toString().c_str()\r
+                );\r
+            domCopy->getOwnerDocument()->release();\r
+            throw UnmarshallingException("Unable to locate builder for cloned element.");\r
+        }\r
+        try {\r
+            auto_ptr<XMLObject> objCopy(b->buildObject(domCopy));\r
+            objCopy->unmarshall(domCopy, true);    // bind document\r
+            return objCopy.release();\r
+        }\r
+        catch (...) {\r
+            domCopy->getOwnerDocument()->release();\r
+            throw;\r
+        }\r
     }\r
-    \r
-    vector<XMLObject*> children;\r
-    if (getOrderedChildren(children))\r
-        for_each(children.begin(),children.end(),bind2nd(_release(),propagateRelease));\r
+    return NULL;\r
 }\r
 \r
-XMLObject* AbstractDOMCachingXMLObject::prepareForAssignment(const XMLObject* oldValue, XMLObject* newValue) {\r
+XMLObject* AbstractDOMCachingXMLObject::prepareForAssignment(XMLObject* oldValue, XMLObject* newValue) {\r
 \r
     if (newValue && newValue->hasParent())\r
         throw XMLObjectException("child XMLObject cannot be added - it is already the child of another XMLObject");\r