Changeset 820 for trunk/zoo-project/zoo-kernel/server_internal.c

Timestamp:

Apr 28, 2017, 6:00:52 PM (7 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).

File:

• trunk/zoo-project/zoo-kernel/server_internal.c (modified) (4 diffs)

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){