Began to implement collection handling.

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

diff --git a/xmltooling/AbstractDOMCachingXMLObject.cpp b/xmltooling/AbstractDOMCachingXMLObject.cpp
index 750e3f9..c1cd6e2 100644 (file)
--- a/xmltooling/AbstractDOMCachingXMLObject.cpp
+++ b/xmltooling/AbstractDOMCachingXMLObject.cpp
@@ -23,6 +23,8 @@
 #include "internal.h"\r
 #include "exceptions.h"\r
 #include "AbstractDOMCachingXMLObject.h"\r
+#include "io/Unmarshaller.h"\r
+#include "util/XMLHelper.h"\r
 \r
 #include <algorithm>\r
 #include <functional>\r
@@ -50,23 +52,27 @@ void AbstractDOMCachingXMLObject::setDOM(DOMElement* dom, bool bindDocument)
 \r
 void AbstractDOMCachingXMLObject::releaseDOM()\r
 {\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
+    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
-    setDOM(NULL);\r
 }\r
 \r
 void AbstractDOMCachingXMLObject::releaseParentDOM(bool propagateRelease)\r
 {\r
     DOMCachingXMLObject* domCachingParent = dynamic_cast<DOMCachingXMLObject*>(getParent());\r
     if (domCachingParent) {\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 (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
+        }\r
         if (propagateRelease)\r
             domCachingParent->releaseParentDOM(propagateRelease);\r
     }\r
@@ -86,13 +92,12 @@ public:
 \r
 void AbstractDOMCachingXMLObject::releaseChildrenDOM(bool propagateRelease)\r
 {\r
-    vector<XMLObject*> children;\r
-    if (getOrderedChildren(children)) {\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(children.begin(),children.end(),bind2nd(_release(),propagateRelease));\r
+        for_each(m_children.begin(),m_children.end(),bind2nd(_release(),propagateRelease));\r
     }\r
 }\r
 \r
@@ -120,3 +125,36 @@ XMLObject* AbstractDOMCachingXMLObject::prepareForAssignment(const XMLObject* ol
 \r
     return newValue;\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 Unmarshaller* u=Unmarshaller::getUnmarshaller(domCopy);\r
+        if (!u) {\r
+            auto_ptr<QName> q(XMLHelper::getNodeQName(domCopy));\r
+            Category::getInstance(XMLTOOLING_LOGCAT".DOM").error(\r
+                "DOM clone failed, unable to locate unmarshaller for element (%s)", q->toString().c_str()\r
+                );\r
+        }\r
+        try {\r
+            return u->unmarshall(domCopy, true);    // bind document\r
+        }\r
+        catch (...) {\r
+            domCopy->getOwnerDocument()->release();\r
+        }\r
+    }\r
+    return NULL;\r
+}\r