Carry exceptions through value/textcontent routines correctly

libAtoms · Dec 22, 2007 · ee3dff8 · ee3dff8
1 parent b394fd1
commit ee3dff8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/dom/m_dom_attribute.m4 b/dom/m_dom_attribute.m4
@@ -45,7 +45,7 @@ TOHW_m_dom_get(Node, ownerElement, np%elExtras%ownerElement, (ATTRIBUTE_NODE))
       TOHW_m_dom_throw_error(FoX_INVALID_NODE)
     endif
 
-    c = getTextContent(arg)
+    c = getTextContent(arg, ex)
 
   end function getValue_DOM
 
@@ -56,7 +56,7 @@ TOHW_m_dom_get(Node, ownerElement, np%elExtras%ownerElement, (ATTRIBUTE_NODE))
     type(Node), pointer :: np
     integer :: i
 
-    call setTextContent(arg, value)
+    call setTextContent(arg, value, ex)
 
   end subroutine setValue
 

diff --git a/dom/m_dom_dom.f90 b/dom/m_dom_dom.f90
@@ -1087,9 +1087,9 @@ subroutine setNodeValue(arg, nodeValue, ex)
 
     select case(arg%nodeType)
     case (ATTRIBUTE_NODE)
-      call setValue(arg, nodeValue)
+      call setValue(arg, nodeValue, ex)
     case (CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE, TEXT_NODE)
-      call setData(arg, nodeValue)
+      call setData(arg, nodeValue, ex)
     end select
 
   end subroutine setNodeValue
@@ -9797,7 +9797,7 @@ function getValue_DOM(arg, ex)result(c)
 
     endif
 
-    c = getTextContent(arg)
+    c = getTextContent(arg, ex)
 
   end function getValue_DOM
 
@@ -9809,7 +9809,7 @@ subroutine setValue(arg, value, ex)
     type(Node), pointer :: np
     integer :: i
 
-    call setTextContent(arg, value)
+    call setTextContent(arg, value, ex)
 
   end subroutine setValue
 

diff --git a/dom/m_dom_node.m4 b/dom/m_dom_node.m4
@@ -97,9 +97,9 @@ TOHW_m_dom_get(DOMString, nodeName, np%nodeName)
 
     select case(arg%nodeType)
     case (ATTRIBUTE_NODE)
-      call setValue(arg, nodeValue)
+      call setValue(arg, nodeValue, ex)
     case (CDATA_SECTION_NODE, COMMENT_NODE, PROCESSING_INSTRUCTION_NODE, TEXT_NODE)
-      call setData(arg, nodeValue)
+      call setData(arg, nodeValue, ex)
     end select
 
   end subroutine setNodeValue