Changeset 802

Timestamp:

Jan 16, 2017, 11:15:51 PM (8 years ago)

Author:

djay

Message:

Fix issue with embedded xml values for WPS 2.0.0.

File:

• trunk/zoo-project/zoo-kernel/request_parser.c (modified) (1 diff)

trunk/zoo-project/zoo-kernel/request_parser.c

@@ -861 +861 @@
                       while(cur4 != NULL && 
                             cur4->type != XML_CDATA_SECTION_NODE &&
-                            cur4->type != XML_TEXT_NODE)
+                            cur4->type != XML_TEXT_NODE &&
+                            cur4->type != XML_ELEMENT_NODE)
                         cur4=cur4->next;
                       if(cur4!=NULL){
-                        if(cur4->content!=NULL){
+                        if (cur4->type == XML_ELEMENT_NODE)
+                          {
+                            xmlChar *mv;
+                            int buffersize;
+                            xmlDocPtr doc1 = xmlNewDoc (BAD_CAST "1.0");
+                            xmlDocSetRootElement (doc1, cur4);
+                            xmlDocDumpFormatMemoryEnc (doc1, &mv,
+                                                       &buffersize,
+                                                       "utf-8", 0);
+                            if (tmpmaps->content != NULL)
+                              addToMap (tmpmaps->content, "value",
+                                        (char *) mv);
+                            else
+                              tmpmaps->content =
+                                createMap ("value", (char *) mv);
+                            free(mv);
+                          }
+                        else{
                           if (tmpmaps->content != NULL)
                             addToMap (tmpmaps->content, "value",