Changeset 869 for trunk/zoo-project

Timestamp:

Feb 27, 2018, 3:35:03 PM (7 years ago)

Author:

djay

Message:

Small change in parse request to handle LiteralData? value.

File:

• trunk/zoo-project/zoo-kernel/request_parser.c (modified) (2 diffs)

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

@@ -968 +968 @@
                         }
 
-                      if (strcasecmp (test->value, "base64") != 0)
+                      if (getMap(tmpmaps->content,"dataType")==NULL && strcasecmp (test->value, "base64") != 0)
                         { 
                           xmlChar *mv = xmlNodeListGetString (doc,
@@ -1046 +1046 @@
                       else
                         {
-                          xmlChar *tmp = xmlNodeListGetRawString (doc,
-                                                                  cur4->xmlChildrenNode,
-                                                                  0);
-                          addToMap (tmpmaps->content, "value",
-                                    (char *) tmp);
-                          xmlFree (tmp);
+                          xmlNodePtr cur5 = cur4->children;
+                          while (cur5 != NULL
+                                 && cur5->type != XML_CDATA_SECTION_NODE)
+                            cur5 = cur5->next;
+                          if (cur5 != NULL
+                              && cur5->type == XML_CDATA_SECTION_NODE)
+                            {
+                              addToMap (tmpmaps->content,
+                                        "value",
+                                        (char *) cur5->content);
+                            }
+                          else{
+                            if(cur4->xmlChildrenNode!=NULL){
+                              xmlChar *tmp = xmlNodeListGetRawString (doc,
+                                                                      cur4->xmlChildrenNode,
+                                                                      0);
+                              addToMap (tmpmaps->content, "value",
+                                        (char *) tmp);
+                              xmlFree (tmp);
+                            }
+                          }
                         }