Changeset 820 for trunk

Timestamp:

Apr 28, 2017, 6:00:52 PM (8 years ago)

Author:

djay

Message:

Fix issue with nested inputs initialization. Fix issue when returning nested outputs. Fix issue with ulinet.c for building the ZOO-Kernel (thanks to Niroshan Sanjaya and Julien Abt for reporting the issue).

Location:

trunk/zoo-project/zoo-kernel

Files:

• response_print.c (modified) (1 diff)
• server_internal.c (modified) (4 diffs)
• ulinet.c (modified) (3 diffs)

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

@@ -1982 +1982 @@
     elements* ecurs=getElements(e,(e!=NULL?e->name:m->name));
     ecurs=ecurs->child;
-    while(curs!=NULL && ecurs!=NULL){
+    while(curs!=NULL){
+      ecurs=getElements(ecurs,(curs->name));
       map* inRequest=getMap(curs->content,"inRequest");
       if(inRequest!=NULL && strncasecmp(inRequest->value,"true",4)==0)
         printIOType(doc,nc1,ns_wps,ns_ows,ns_xlink,ecurs,curs,type,vid);
       curs=curs->next;
-      ecurs=ecurs->next;
+      ecurs=getElements(e,(e!=NULL?e->name:m->name));
+      ecurs=ecurs->child;
     }
   }

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

@@ -662 +662 @@
             if(tmpMaps2->content==NULL)
               tmpMaps2->content=createMap(tmpm->name,tmpm->value);
-            else
+            else{
               addToMap(tmpMaps2->content,tmpm->name,tmpm->value);
+            }
             tmpm=tmpm->next;
           }
         }
-        addToMap(tmpMaps2->content,"inRequest","false");
+        if(tmpMaps2->content==NULL){
+          tmpMaps2->content=createMap("inRequest","false");
+          dumpMaps(tmpMaps2);
+        }
+        else
+          addToMap(tmpMaps2->content,"inRequest","false");
         if(type==0){
           map *tmpMap=getMap(tmpMaps2->content,"value");
@@ -673 +679 @@
             addToMap(tmpMaps2->content,"value","NULL");
         }
+        elements* tmpElements=getElements(in,tmpMaps2->name);
+        if(tmpElements!=NULL && tmpElements->child!=NULL){
+          char *res=addDefaultValues(&tmpMaps2->child,tmpElements->child,m,type,err);
+          if(strlen(res)>0){
+            return res;
+          }
+        }
+
         if(out1==NULL){
           *out=dupMaps(&tmpMaps2);
@@ -687 +701 @@
       }
     }
-    else{
+    else { 
       iotype* tmpIoType=NULL;
       if(tmpMaps->content!=NULL){
@@ -820 +834 @@
         addToMap(tmpMaps->content,"inRequest","true");
       elements* tmpElements=getElements(in,tmpMaps->name);
-      if(tmpMaps->child!=NULL && tmpElements!=NULL && tmpElements->child!=NULL){
+      if(tmpElements!=NULL && tmpElements->child!=NULL){
         char *res=addDefaultValues(&tmpMaps->child,tmpElements->child,m,type,err);
         if(strlen(res)>0){
-          fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
           return res;
         }
       }
     }
-    if(tmpInputs->child!=NULL){
-      tmpInputss=tmpInputs->next;
-      tmpInputs=tmpInputs->child;
-      if(tmpMaps!=NULL){
-        out1=tmpMaps->child;
-        out1s=tmpMaps;
-      }
-    }else
-      tmpInputs=tmpInputs->next;
+    tmpInputs=tmpInputs->next;
   }
   if(tmpInputss!=NULL){

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

@@ -191 +191 @@
  * @param proto the protocol requiring the use of a proxy
  */
-bool setProxiesForProtcol(CURL* handle,const char *proto){
+int setProxiesForProtcol(CURL* handle,const char *proto){
 #ifdef MSG_LAF_VERBOSE
   fprintf( stderr, "setProxiesForProtocol (do nothing) ...\n" );
 #endif
-  return true;
+  return 0;
 }
 #endif
@@ -284 +284 @@
     char *token, *saveptr;
     token = strtok_r (tmp, ",", &saveptr);
-    for(int i=0;i<handle->nb;i++){
+    int i;
+    for(i=0;i<handle->nb;i++){
       if(targetHosts->value[0]=='*' || isProtectedHost(targetHosts->value,handle->ihandle[i].url)==1){
         while (token != NULL){
@@ -290 +291 @@
           char* tmp1=(char*)malloc(length*sizeof(char));
           snprintf(tmp1,6,"HTTP_");
-          for(int i=0;token[i]!='\0';i++){
-            if(token[i]!='-')
-              tmp1[5+i]=toupper(token[i]);
+          int j;
+          for(j=0;token[j]!='\0';j++){
+            if(token[j]!='-')
+              tmp1[5+j]=toupper(token[i]);
             else
-              tmp1[5+i]='_';
-            tmp1[5+i+1]='\0';
+              tmp1[5+j]='_';
+            tmp1[5+j+1]='\0';
           }
           fprintf(stderr,"%s %d %s \n",__FILE__,__LINE__,tmp1);