Changeset 618 for trunk/zoo-project/zoo-kernel/service_conf.y

Timestamp:

Mar 28, 2015, 12:58:00 AM (9 years ago)

Author:

djay

Message:

Fix for OTB support when input was passed by value rather than reference.

File:

• trunk/zoo-project/zoo-kernel/service_conf.y (modified) (4 diffs)

trunk/zoo-project/zoo-kernel/service_conf.y

@@ -20 +20 @@
 static bool wait_defaults=false;
 static bool wait_supporteds=false;
-static bool wait_outputs=-1;
+static bool wait_outputs=false;
 static bool wait_data=false;
 static service* my_service=NULL;
@@ -805 +805 @@
   dumpElements(current_element);
 #endif
-  if(wait_outputs>0 && current_element!=NULL && current_element->name!=NULL){
+  if(wait_outputs && current_element!=NULL && current_element->name!=NULL){
     if(my_service->outputs==NULL){  
 #ifdef DEBUG_SERVICE_CONF
@@ -834 +834 @@
     current_element=NULL;
   }
-  int contentOnly=-1;
+  int contentOnly=false;
   if(current_content!=NULL){
     if(my_service->content==NULL){
       addMapToMap(&my_service->content,current_content);
-      contentOnly=1;
+      contentOnly=true;
+      wait_maincontent=false;
     }
     freeMap(&current_content);
@@ -848 +849 @@
   dumpService(my_service);
 #endif
-  if(contentOnly<0 && ((wait_outputs<0 && current_data==2 && my_service->outputs==NULL) || my_service==NULL || my_service->name==NULL || my_service->content==NULL)){
+  if(wait_maincontent==true || (contentOnly==false && ((!wait_outputs && current_data==2 && my_service->outputs==NULL) || my_service==NULL || my_service->name==NULL || my_service->content==NULL))){
     setMapInMaps(conf,"lenv","message",srlval.chaine);
 #ifndef WIN32