Changeset 673 for trunk/zoo-project/zoo-kernel/response_print.c

Timestamp:

Jun 17, 2015, 5:52:29 PM (9 years ago)

Author:

djay

Message:

Fixes in configure.ac. Fix in registry creation. Fixes for Data node for WPS version 2.0.0.

File:

• trunk/zoo-project/zoo-kernel/response_print.c (modified) (5 diffs)

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

@@ -451 +451 @@
             xmlAddChild(nc,nc2);
             nc2 = xmlNewNode(ns_ows, BAD_CAST "ServiceTypeVersion");
-            dumpMaps(m);
             map* tmpv=getMapFromMaps(m,"main","rversion");
             xmlAddChild(nc2,xmlNewText(BAD_CAST tmpv->value));
@@ -1914 +1913 @@
          strcasecmp(tmp->name,"datatype")==0 ||
          strcasecmp(tmp->name,"uom")==0) {
-
-        xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
-      }
+        
+        if(vid==0)
+          xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
+        else{
+          if(strcasecmp(tmp->name,"datatype")==0)
+            xmlNewProp(nc2,BAD_CAST "mimeType",BAD_CAST "text/plain");
+          else
+            if(strcasecmp(tmp->name,"uom")!=0)
+              xmlNewProp(nc2,BAD_CAST tmp->name,BAD_CAST tmp->value);
+        }
+      }
+      if(vid==0)
+        xmlAddChild(nc2,nc3);
       tmp=tmp->next;
-      xmlAddChild(nc2,nc3);
     }
     if(e!=NULL && e->format!=NULL && strcasecmp(e->format,"BoundingBoxData")==0) {
@@ -1970 +1978 @@
         }
          
-        xmlAddChild(nc3,xmlNewText(BAD_CAST base64(tmp3->value, atoi(rs->value))));  // base 64 encode in XML
+        xmlAddChild((vid==0?nc3:nc2),xmlNewText(BAD_CAST base64(tmp3->value, atoi(rs->value))));  // base 64 encode in XML
                 
         if(tmp1==NULL || (tmp1!=NULL && strncmp(tmp1->value,"base64",6)!=0)) {
-          xmlAttrPtr ap = xmlHasProp(nc3, BAD_CAST "encoding");
+          xmlAttrPtr ap = xmlHasProp((vid==0?nc3:nc2), BAD_CAST "encoding");
           if (ap != NULL) {
             xmlRemoveProp(ap);
           }                     
-          xmlNewProp(nc3,BAD_CAST "encoding",BAD_CAST "base64");
+          xmlNewProp((vid==0?nc3:nc2),BAD_CAST "encoding",BAD_CAST "base64");
         }
                 
@@ -1990 +1998 @@
            strstr(tmp2->value, "ecmascript") != NULL
            ) {
-          xmlAddChild(nc3,xmlNewCDataBlock(doc,BAD_CAST tmp3->value,strlen(tmp3->value)));
+          xmlAddChild((vid==0?nc3:nc2),xmlNewCDataBlock(doc,BAD_CAST tmp3->value,strlen(tmp3->value)));
         }   
         else {                                                     // else
@@ -2002 +2010 @@
             xmlDocPtr doc = iDocs[li];
             xmlNodePtr ir = xmlDocGetRootElement(doc);
-            xmlAddChild(nc3,ir);
+            xmlAddChild((vid==0?nc3:nc2),ir);
           }
           else                                                     // else      
-            xmlAddChild(nc3,xmlNewText(BAD_CAST tmp3->value));    //   add text node
+            xmlAddChild((vid==0?nc3:nc2),xmlNewText(BAD_CAST tmp3->value));    //   add text node
         }
         xmlAddChild(nc2,nc3);
       }
       else {
-        xmlAddChild(nc3,xmlNewText(BAD_CAST tmp3->value));
+        xmlAddChild((vid==0?nc3:nc2),xmlNewText(BAD_CAST tmp3->value));
       }