Changeset 946 for trunk

Timestamp:

Aug 22, 2019, 1:58:36 PM (5 years ago)

Author:

djay

Message:

Add the optional handleText parameter in the main section of the main.cfg file to make sure that text node provided in multiple CDATA nodes child of the complex data are pure text.

Location:

trunk

Files:

• docs/kernel/configuration.rst (modified) (1 diff)
• zoo-project/HISTORY.txt (modified) (1 diff)
• zoo-project/zoo-kernel/request_parser.c (modified) (1 diff)

trunk/docs/kernel/configuration.rst

@@ -98 +98 @@
    the value field of the inputs data will be filled by the ZOO-Kernel
    or ``protected`` to have only the ``cache_file`` filled.
-
+ * ``handleText``: (Optional) set it to ``true`` to get your Complex data
+   nodes containing text not requiring a single CDATA node. Be aware
+   that in case you use any HTML or XML there, you will then need to
+   rebuild the string to get the original format of the text from your
+   service code. In case you do not add handleText or set its value to
+   true, you will simply need to use the value as it was provided in
+   a single CDATA node provided in the Execute request.
 
 .. warning:: 

trunk/zoo-project/HISTORY.txt

@@ -1 +1 @@
 Version 1.8.0-dev
+  * Add the optional handleText parameter to provide pure text for
+  complex data node with mimetype="text/*"
   * Fix issue in case JavaScript support is activated
   * Fix issue with GDAL profile service

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

@@ -1071 +1071 @@
                                 }
                               else if (cur5 != NULL){
-                                if(ltmp!= NULL && strstr(ltmp->value,"text/")!=NULL){
+                                map* handleText=getMapFromMaps(*main_conf,"main","handleText");
+                                if(handleText!=NULL && strcasecmp(handleText->value,"true")==0 && ltmp!= NULL && strstr(ltmp->value,"text/")!=NULL){
                                   xmlChar *tmp = xmlNodeListGetRawString (doc,
                                                                           cur4->xmlChildrenNode,