@@ -202,7 +202,7 @@ static int ooxml_parse_element(cli_ctx *ctx, xmlTextReaderPtr reader, json_objec

 {

     const char *element_tag = NULL, *end_tag = NULL;

     const xmlChar *node_name = NULL, *node_value = NULL;

-    json_object *thisjobj;

+    json_object *thisjobj = NULL;

     int node_type, ret = CL_SUCCESS, endtag = 0, toval = 0;

     cli_dbgmsg("in ooxml_parse_element @ layer %d\n", rlvl);

@@ -238,6 +238,32 @@ static int ooxml_parse_element(cli_ctx *ctx, xmlTextReaderPtr reader, json_objec

     }

     /* handle attributes if you want */

+    if (xmlTextReaderHasAttributes(reader) == 1) {

+        json_object *attributes;

+

+        thisjobj = cli_jsonobj(wrkptr, element_tag);

+        if (!thisjobj) {

+            return CL_EPARSE;

+        }

+        cli_dbgmsg("ooxml_parse_element: retrieved json object [%s]\n", element_tag);

+

+        attributes = cli_jsonobj(thisjobj, "Attributes");

+        if (!thisjobj) {

+            return CL_EPARSE;

+        }

+        cli_dbgmsg("ooxml_parse_element: retrieved json object [Attributes]\n");

+

+        while (xmlTextReaderMoveToNextAttribute(reader) == 1) {

+            const xmlChar *name, *value;

+            name = xmlTextReaderConstLocalName(reader);

+            value = xmlTextReaderConstValue(reader);

+            if (name == NULL || value == NULL) continue;

+

+            cli_dbgmsg("%s: %s\n", name, value);

+

+            cli_jsonstr(attributes, name, value);

+        }

+    }

     /* advance to first content node */

     if (xmlTextReaderRead(reader) != 1)

@@ -253,11 +279,13 @@ static int ooxml_parse_element(cli_ctx *ctx, xmlTextReaderPtr reader, json_objec

         switch (node_type) {

         case XML_READER_TYPE_ELEMENT:

             /* generate json object node */

-            thisjobj = cli_jsonobj(wrkptr, element_tag);

             if (!thisjobj) {

-                return CL_EPARSE;

+                thisjobj = cli_jsonobj(wrkptr, element_tag);

+                if (!thisjobj) {

+                    return CL_EPARSE;

+                }

+                cli_dbgmsg("ooxml_parse_element: retrieved json object [%s]\n", element_tag);

             }

-            cli_dbgmsg("ooxml_parse_element: retrieved json object [%s]\n", element_tag);

             if (rlvl == 0)

                 root = thisjobj;