Changeset 896 for branches/prototype-v0/zoo-project/zoo-kernel/response_print.c

Timestamp:

Feb 25, 2019, 1:57:11 PM (5 years ago)

Author:

knut

Message:

Added some recent changes from trunk (r889), including some new utility functions and exception handling and new (conditional) definition of type bool. Added some new logic concerning Python and Mono environment and search paths. Fixed problem with Mono updateStatus function. Changed response_print.h to #include locale.h unconditionally and xlocale.h conditionally; xlocale.h is non-standard and can probably be dropped.

File:

• branches/prototype-v0/zoo-project/zoo-kernel/response_print.c (modified) (24 diffs)

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

@@ -1776 +1776 @@
  * @param outputs the outputs generated by the service
  */
-void printProcessResponse(maps* m,map* request, int pid,service* serv,const char* service,int status,maps* inputs,maps* outputs){
+void printProcessResponse(maps* m,map* request, int pid,service* serv,const char* service,int status,maps* inputs,maps* outputs){       
   xmlNsPtr ns,ns_ows,ns_xlink;
   xmlNodePtr nr,n,nc,nc1=NULL,nc3;
@@ -1797 +1797 @@
   char stored_path[1024];
   memset(stored_path,0,1024);
-    
+  
   if(vid==0){
     char tmp[256];
@@ -1982 +1982 @@
     }
   }
-
+  
   /**
    * Display the process output only when requested !
@@ -1993 +1993 @@
     maps* mcursor=outputs;
     elements* scursor=serv->outputs;
-    map* testResponse=getMap(request,"RawDataOutput");
+    map* testResponse=getMap(request,"RawDataOutput");  
     if(testResponse==NULL)
       testResponse=getMap(request,"ResponseDocument");
-    while(mcursor!=NULL){
+    while(mcursor!=NULL){               
       map* tmp0=getMap(mcursor->content,"inRequest");
-      scursor=getElements(serv->outputs,mcursor->name);
-      if(scursor!=NULL){
-        if(testResponse==NULL || tmp0==NULL){
+      scursor=getElements(serv->outputs,mcursor->name);   
+      if(scursor!=NULL){                  
+        if(testResponse==NULL || tmp0==NULL){           
           if(vid==0)
             printIOType(doc,nc,ns,ns_ows,ns_xlink,scursor,mcursor,"Output",vid);
@@ -2007 +2007 @@
         }
         else
-          if(tmp0!=NULL && strncmp(tmp0->value,"true",4)==0){
+          if(tmp0!=NULL && strncmp(tmp0->value,"true",4)==0){             
             if(vid==0)
               printIOType(doc,nc,ns,ns_ows,ns_xlink,scursor,mcursor,"Output",vid);
             else
               printIOType(doc,n,ns,ns_ows,ns_xlink,scursor,mcursor,"Output",vid);
-          }
+          }     
       }else
         /**
@@ -2023 +2023 @@
           printIOType(doc,n,ns,ns_ows,ns_xlink,scursor,mcursor,"Output",vid);
       mcursor=mcursor->next;
-    }
+    }   
     if(vid==0)
       xmlAddChild(n,nc);
-  }
-
+  }  
   if(vid==0 && 
      hasStoredExecuteResponse==true 
@@ -2176 +2175 @@
  * @param type the type
  */
-void printIOType(xmlDocPtr doc,xmlNodePtr nc,xmlNsPtr ns_wps,xmlNsPtr ns_ows,xmlNsPtr ns_xlink,elements* e,maps* m,const char* type,int vid){
-
+void printIOType(xmlDocPtr doc,xmlNodePtr nc,xmlNsPtr ns_wps,xmlNsPtr ns_ows,xmlNsPtr ns_xlink,elements* e,maps* m,const char* type,int vid){   
   xmlNodePtr nc1,nc2,nc3;
   nc1=xmlNewNode(ns_wps, BAD_CAST type);
@@ -2184 +2182 @@
     tmp=e->content;
   else
-    tmp=m->content;
-
+    tmp=m->content;  
   if(vid==0){
     nc2=xmlNewNode(ns_ows, BAD_CAST "Identifier");
@@ -2225 +2222 @@
     xmlNewProp(nc1,BAD_CAST "id",BAD_CAST (e!=NULL?e->name:m->name));
   }
-
+  
   // IO type nested outputs
-  if(m->child!=NULL){
+  if(m->child!=NULL){     
     maps* curs=m->child;
     elements* ecurs=getElements(e,(e!=NULL?e->name:m->name));
@@ -2241 +2238 @@
     }
   }
-  else{
+  else{   
     map *tmpMap=getMap(m->content,"Reference");
-    if(tmpMap==NULL){
+    if(tmpMap==NULL){           
       nc2=xmlNewNode(ns_wps, BAD_CAST "Data");
-      if(e!=NULL && e->format!=NULL){
-        if(strncasecmp(e->format,"LiteralOutput",strlen(e->format))==0)
-          nc3=xmlNewNode(ns_wps, BAD_CAST "LiteralData");
+      if(e!=NULL && e->format!=NULL){             
+                  if (strncasecmp(e->format, "LiteralOutput", strlen(e->format)) == 0)                                    
+                          nc3 = xmlNewNode(ns_wps, BAD_CAST "LiteralData");               
         else
           if(strncasecmp(e->format,"ComplexOutput",strlen(e->format))==0)
@@ -2254 +2251 @@
             nc3=xmlNewNode(ns_wps, BAD_CAST "BoundingBoxData");
           else
-            nc3=xmlNewNode(ns_wps, BAD_CAST e->format);
-      }
-      else {
-        map* tmpV=getMapFromMaps(m,"format","value");
+            nc3=xmlNewNode(ns_wps, BAD_CAST e->format);           
+      }
+      else {              
+        map* tmpV=getMapFromMaps(m,"format","value");   
         if(tmpV!=NULL)
           nc3=xmlNewNode(ns_wps, BAD_CAST tmpV->value);
@@ -2263 +2260 @@
           nc3=xmlNewNode(ns_wps, BAD_CAST "LiteralData");
       } 
-      tmp=m->content;
-      
+      tmp=m->content;     
+
       while(tmp!=NULL){
         if(strcasecmp(tmp->name,"mimeType")==0 ||
@@ -2270 +2267 @@
            strcasecmp(tmp->name,"schema")==0 ||
            strcasecmp(tmp->name,"datatype")==0 ||
-           strcasecmp(tmp->name,"uom")==0) {
-          
+           strcasecmp(tmp->name,"uom")==0) {    
           if(vid==0)
             xmlNewProp(nc3,BAD_CAST tmp->name,BAD_CAST tmp->value);
@@ -2282 +2278 @@
           }
         }
+
         if(vid==0)
           xmlAddChild(nc2,nc3);
-        tmp=tmp->next;
+        tmp=tmp->next;  
       }
       if(e!=NULL && e->format!=NULL && strcasecmp(e->format,"BoundingBoxData")==0) {
@@ -2295 +2292 @@
         }
       }
-      else {
-        if(e!=NULL)
-          tmp=getMap(e->defaults->content,"mimeType");
+      else {              
+                  //if (e != NULL) {
+                  if (e != NULL && e->defaults != NULL) { // knut: add extra NULL pointer check in case user omits <Default> block in config file                         
+                          tmp = getMap(e->defaults->content, "mimeType");
+                  }
         else
-          tmp=NULL;
-        
+          tmp=NULL;     
         map* tmp1=getMap(m->content,"encoding");
         map* tmp2=getMap(m->content,"mimeType");
@@ -2640 +2638 @@
   dumpMaps(request_outputs);
   fprintf(stderr,"printProcessResponse\n");
-#endif
+#endif  
   map* toto=getMap(request_inputs1,"RawDataOutput");
   int asRaw=0;
@@ -2727 +2725 @@
   }
 
-  if(res!=SERVICE_SUCCEEDED){
+  if(res!=SERVICE_SUCCEEDED){     
     printProcessResponse(m,request_inputs1,cpid,
                          s, s->name,res,  // replace serviceProvider with serviceName in stored response file name
@@ -2734 +2732 @@
     return;
   }
-    
-        
+      
   map *tmp1=getMapFromMaps(m,"main","tmpPath");
   if(asRaw==0){
@@ -2757 +2754 @@
 #endif
       map *gfile=getMap(tmpI->content,"generated_file");
-      char *file_name=NULL;
+      char *file_name=NULL;       
       if(gfile!=NULL){
         gfile=getMap(tmpI->content,"expected_generated_file");
@@ -2765 +2762 @@
         readGeneratedFile(m,tmpI->content,gfile->value);
         file_name=zStrdup((gfile->value)+strlen(tmp1->value));
-      }
+      }   
       toto=getMap(tmpI->content,"asReference");
 #ifdef USE_MS
@@ -2776 +2773 @@
         if(toto!=NULL && strcasecmp(toto->value,"true")==0)
 #endif
-          {
+          {             
             elements* in=getElements(s->outputs,tmpI->name);
             if(in==NULL && s->outputs->child!=NULL){
@@ -2791 +2788 @@
               addToMap(tmpI->content,"encoding","UTF-8");
               addToMap(tmpI->content,"schema","http://schemas.opengis.net/ows/1.1.0/owsCommon.xsd");
-            }
-
+            }           
             char *file_path=NULL;
             if(gfile==NULL) {
@@ -2880 +2876 @@
           }
         }
-#endif
+#endif  
       if(file_name!=NULL){
         free(file_name);
@@ -2896 +2892 @@
     fprintf(stderr,"SERVICE : %s\n",s->name);
     dumpMaps(m);
-#endif
+#endif  
     if(error<0)
       printProcessResponse(m,request_inputs1,cpid,