ignore non-leaf text nodes

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7353 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/OpenSRF/src/utils/xml_utils.c b/OpenSRF/src/utils/xml_utils.c
index 15a350b..cb2164f 100644 (file)
--- a/OpenSRF/src/utils/xml_utils.c
+++ b/OpenSRF/src/utils/xml_utils.c
@@ -48,10 +48,16 @@ jsonObject* _xmlToJSON(xmlNodePtr node, jsonObject* obj) {
                }
 
                xmlNodePtr child = node->children;
-               while(child) {
-                       _xmlToJSON(child, new_obj);
-                       child = child->next;
-               }       
+                if (child) { // at least one...
+                       if (child != node->last) { // more than one -- ignore TEXT nodes
+                               while(child) {
+                                       if (child->type != XML_TEXT_NODE) _xmlToJSON(child, new_obj);
+                                       child = child->next;
+                               }
+                       } else {
+                               _xmlToJSON(child, new_obj);
+                       }
+                }
        }       
 
        return obj;