ocaml 3.09 transition

[helm.git] / helm / DEVEL / mathml_editor / src / CMathMLFactoryXSLT.cc

diff --git a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
index efc672c024cff05b4290bd73348a66a5d21de4ea..8884520308d2b24edef48811edf5749a5a87b238 100644 (file)
--- a/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
+++ b/helm/DEVEL/mathml_editor/src/CMathMLFactoryXSLT.cc
@@ -25,9 +25,11 @@
 
 #include "dom.hh"
 #include "TNode.hh"
+#include "ALogger.hh"
 #include "TDocument.hh"
 #include "CMathMLFactoryXSLT.hh"
 #include "AMathMLConsumer.hh"
+#include <cassert>
 
 CMathMLFactoryXSLT::CMathMLFactoryXSLT(ALogger& l, const DOMX::XSLTStylesheet& s)
   : AMathMLFactory(l), style(s)
@@ -37,6 +39,7 @@ CMathMLFactoryXSLT::CMathMLFactoryXSLT(ALogger& l, const DOMX::XSLTStylesheet& s
   result = di.createDocument(MATHML_NS_URI, "m:math", dt);
 }
 
+#if 1
 void
 CMathMLFactoryXSLT::documentModified(TDocument& doc)
 {
@@ -47,23 +50,72 @@ CMathMLFactoryXSLT::documentModified(TDocument& doc)
                                       DOM::GdomeString("'" + std::string(dirty["id"]) + "'")));
   DOM::Document res = style.apply(doc.document(), dirtyId);
   assert(res);
-  style.save(doc.document(), stdout);
+  //style.save(doc.document(), stdout);
 
-  DOM::Element root = res.get_documentElement();
-  assert(root);
-
-  if (result.get_documentElement().hasAttribute("xref"))
+  if (DOM::Element wrapper = res.get_documentElement())
     {
-      bool ok = subst(result.get_documentElement(), root.getAttribute("xref"), result.importNode(root, true));
-      assert(ok);
+      if (DOM::Element root = wrapper.get_firstChild())
+       if (DOM::Element oldRoot = result.get_documentElement().get_firstChild())
+         {
+           bool ok = subst(oldRoot, root.getAttribute("xref"), result.importNode(root, true));
+           assert(ok);
+           doc.clearDirty();
+         }
+       else
+         {
+           result.get_documentElement().appendChild(result.importNode(root, true));
+         }
     }
   else
-    result.replaceChild(result.importNode(root, true), result.get_documentElement());
+    {
+      // Something wrong happened while applying the stylesheet.
+      DOM::Element root = result.get_documentElement();
+      DOM::Node p = root.get_firstChild();
+      while (p) {
+       DOM::Node next = p.get_nextSibling();
+       root.removeChild(p);
+       p = next;
+      }
+      logger.error("The stylesheet produced an empty document");
+    }
+
+  //style.save(result, stdout);
+}
+#else
+void
+CMathMLFactoryXSLT::documentModified(TDocument& doc)
+{
+  DOM::Document res = style.apply(doc.document());
+  assert(res);
 
-  style.save(result, stdout);
+  if (DOM::Element root = res.get_documentElement())
+    {
+      DOM::Element newRoot = root.get_firstChild();
+      assert(newRoot);
 
-  doc.clearDirty();
+      if (DOM::Element oldSubRoot = result.get_documentElement().get_firstChild())
+        {
+         result.get_documentElement().replaceChild(result.importNode(newRoot, true), oldSubRoot);
+        }
+      else
+       {
+         result.get_documentElement().appendChild(result.importNode(newRoot, true));
+       }
+    }
+  else
+    {
+      // Something wrong happened while applying the stylesheet.
+      DOM::Element root = result.get_documentElement();
+      DOM::Node p = root.get_firstChild();
+      while (p) {
+       DOM::Node next = p.get_nextSibling();
+       root.removeChild(p);
+       p = next;
+      }
+      logger.error("The stylesheet produced an empty document");
+    }
 }
+#endif
 
 bool
 CMathMLFactoryXSLT::subst(const DOM::Element& e1, const DOM::GdomeString& id, const DOM::Element& e2)