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

Timestamp:

Sep 12, 2018, 4:02:49 PM (6 years ago)

Author:

djay

Message:

Modify memory configuration option gesture. Now, in case you don't have setup memory option in the main section your main.cfg file then, the ZOO-Kernel will load everything in memory and will also store the file containing the input. In case you want the old mode, you have to set memory option to 'load' in your main.cfg file. Fix issue with loading R ZOO-Service located in a subdirectory. Support for XML Execute request containing TEXT_NODE when CDATA_NODE should be used.

File:

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

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

@@ -978 +978 @@
 
                       map *test = getMap (tmpmaps->content, "encoding");
-                      
                       if (test == NULL)
                         {
@@ -992 +991 @@
                       if (getMap(tmpmaps->content,"dataType")==NULL && test!=NULL && strcasecmp (test->value, "base64") != 0)
                         {
-                          xmlChar *mv = xmlNodeListGetString (doc,
-                                                              cur4->xmlChildrenNode,
-                                                              1);
+                          xmlChar *mv = NULL;
+                          /*if(cur4!=NULL && cur4->xmlChildrenNode!=NULL)
+                            xmlChar *mv = xmlNodeListGetString (doc,
+                                                                cur4->xmlChildrenNode,
+                                                                1);*/
                           map *ltmp =
-                            getMap (tmpmaps->content, "mimeType");                        
-                          if (mv == NULL
-                              ||
+                            getMap (tmpmaps->content, "mimeType");
+                          if (/*mv == NULL
+                              ||*/
                               (xmlStrcasecmp
                                (cur4->name, BAD_CAST "ComplexData") == 0
@@ -1036 +1037 @@
                                            buffersize);
                             }else{
+
                             if(xmlStrcasecmp
                                (cur4->name, BAD_CAST "BoundingBoxData") == 0){
@@ -1051 +1053 @@
                               while (cur5 != NULL
                                      && cur5->type != XML_ELEMENT_NODE
+                                     && cur5->type != XML_TEXT_NODE
                                      && cur5->type != XML_CDATA_SECTION_NODE)
                                 cur5 = cur5->next;
                               if (cur5 != NULL
-                                  && cur5->type != XML_CDATA_SECTION_NODE)
+                                  && cur5->type != XML_CDATA_SECTION_NODE
+                                  && cur5->type != XML_TEXT_NODE)
                                 {
                                   xmlDocPtr doc1 = xmlNewDoc (BAD_CAST "1.0");
@@ -1065 +1069 @@
                                                buffersize);
                                 }
-                              else /*if (cur5 != NULL
+                              else if (cur5 != NULL)/*
                                      && cur5->type == XML_CDATA_SECTION_NODE)*/{
                                 xmlFree(mv);
-                                mv=xmlStrdup(cur5->content);
+                                if(cur5->content!=NULL){
+                                  mv=xmlStrdup(cur5->content);
+                                }
                               }
                             }
@@ -1150 +1156 @@
                   }
               }
-            else
+            else{
               addMapsToMaps (request_output, tmpmaps);
+            }
           }
           freeMaps (&tmpmaps);