Changeset 871 for branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

Timestamp:

Feb 27, 2018, 4:17:05 PM (6 years ago)

Author:

djay

Message:

Use curl_multi_wait only in case libcurl minor version number is upper or equal to 28.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c (modified) (5 diffs)

branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

@@ -933 +933 @@
                                     tmpmaps->content =
                                       createMap (list[l], (char *) val);
+                                  xmlFree (val);
                                 }
-                              xmlFree (val);
+                              else{
+                                if(l==0){
+                                  if (tmpmaps->content != NULL)
+                                    addToMap (tmpmaps->content, list[l],
+                                              "string");
+                                  else
+                                    tmpmaps->content =
+                                      createMap (list[l],"string");
+                                }
+                              }
                               free (list[l]);
                             }
@@ -959 +969 @@
                                       tmpmaps->content =
                                         createMap (coms[l], (char *) val);
+                                    xmlFree (val);
                                   }
-                                xmlFree (val);
                               }
                           }
 
                       map *test = getMap (tmpmaps->content, "encoding");
-
+                      
                       if (test == NULL)
-                        { 
+                        {
                           if (tmpmaps->content != NULL)
                             addToMap (tmpmaps->content, "encoding",
@@ -977 +987 @@
                         }
 
-                      if (strcasecmp (test->value, "base64") != 0)
+                      if (getMap(tmpmaps->content,"dataType")==NULL && test!=NULL && strcasecmp (test->value, "base64") != 0)
                         {
                           xmlChar *mv = xmlNodeListGetString (doc,
@@ -983 +993 @@
                                                               1);
                           map *ltmp =
-                            getMap (tmpmaps->content, "mimeType");
+                            getMap (tmpmaps->content, "mimeType");                        
                           if (mv == NULL
                               ||
@@ -1068 +1078 @@
                       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);
+                            }
+                          }
                         }