Changeset 942 for tags/rel-1.7.0/zoo-project/zoo-kernel/request_parser.c

Timestamp:

Jun 14, 2019, 11:05:08 PM (5 years ago)

Author:

djay

Message:

Tag the 1.7.0 release.

Location:

tags/rel-1.7.0

Files:

• . (copied) (copied from branches/branch-1.7) (1 prop)
• zoo-project/zoo-kernel/request_parser.c (modified) (3 diffs)

tags/rel-1.7.0/zoo-project/zoo-kernel/request_parser.c

@@ -1070 +1070 @@
                                                buffersize);
                                 }
-                              else if (cur5 != NULL)/*
-                                     && cur5->type == XML_CDATA_SECTION_NODE)*/{
-                                xmlFree(mv);
-                                if(cur5->content!=NULL){
-                                  mv=xmlStrdup(cur5->content);
-                                }
+                              else if (cur5 != NULL){
+                                if(ltmp!= NULL && strstr(ltmp->value,"text/")!=NULL){
+                                  xmlChar *tmp = xmlNodeListGetRawString (doc,
+                                                                          cur4->xmlChildrenNode,
+                                                                          0);
+                                  addToMap (tmpmaps->content, "value",
+                                            (char *) tmp);
+                                  xmlFree (tmp);
+                                }else{
+                                  while(cur5!=NULL && cur5->type != XML_CDATA_SECTION_NODE)
+                                    cur5=cur5->next;
+                                  xmlFree(mv);
+                                  if(cur5!=NULL && cur5->content!=NULL){
+                                    mv=xmlStrdup(cur5->content);
+                                  }
+                                }
                               }
                             }
@@ -1859 +1869 @@
   if (r_inputs == NULL){
     if(mandatory>0){
-      char *replace=_("Mandatory parameter <%s> was not specified");
+      const char *replace=_("Mandatory parameter <%s> was not specified");
       char *message=(char*)malloc((strlen(replace)+strlen(toCheck)+1)*sizeof(char));
       sprintf(message,replace,toCheck);
@@ -1908 +1918 @@
     }
     if(hasValidValue<0){
-      char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
+      const char *replace=_("The value <%s> was not recognized, %s %s the only acceptable value.");
       nb=0;
       char *vvalues=NULL;
-      char* num=_("is");
+      const char* num=_("is");
       while(avalues[nb]!=NULL){
         char *tvalues;