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

Timestamp:

Dec 12, 2017, 4:09:47 PM (6 years ago)

Author:

djay

Message:

Add status_code key to the lenv section to support returning a specific HTTP error code from the service code. Fix callback invocation to support inputs arrays at step 1 and 2. Fix issue with cpu usage. Fix issue with mapserver publication when an input is optional. Fix callback invocation at step 7 in case the service has failed on the HPC side.

File:

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

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

@@ -2465 +2465 @@
   else
     exceptionCode="501 Internal Server Error";
-
+  tmp=getMapFromMaps(m,"lenv","status_code");
+  if(tmp!=NULL)
+    exceptionCode=tmp->value;
   if(m!=NULL){
     map *tmpSid=getMapFromMaps(m,"lenv","sid");
@@ -2605 +2607 @@
 void outputResponse(service* s,maps* request_inputs,maps* request_outputs,
                     map* request_inputs1,int cpid,maps* m,int res){
-                
 #ifdef DEBUG
   dumpMaps(request_inputs);
@@ -2659 +2660 @@
     }
   }
-                 
   if(res==SERVICE_FAILED){
     map *lenv;
@@ -2718 +2718 @@
       toto=getMap(tmpI->content,"asReference");
 #ifdef USE_MS
-      restartNoMS:
+    restartNoMS:
       map* geodatatype=getMap(tmpI->content,"geodatatype");
       
@@ -2778 +2778 @@
 
             toto=getMap(tmpI->content,"value");
+            if(toto==NULL){
+              char tmpMsg[1024];
+              sprintf(tmpMsg,_("No value found for the requested output %s."),tmpI->name);
+              errorException(m,tmpMsg,"InternalError",NULL);
+              fclose(ofile);
+              free(file_name);
+              free(file_path);
+              return;
+            }
             if(strcasecmp(format,"BoundingBoxData")!=0){
               map* size=getMap(tmpI->content,"size");