Ignore:
Timestamp:
Mar 28, 2015, 12:58:00 AM (7 years ago)
Author:
djay
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/service_conf.y

    r607 r618  
    2020static bool wait_defaults=false;
    2121static bool wait_supporteds=false;
    22 static bool wait_outputs=-1;
     22static bool wait_outputs=false;
    2323static bool wait_data=false;
    2424static service* my_service=NULL;
     
    805805  dumpElements(current_element);
    806806#endif
    807   if(wait_outputs>0 && current_element!=NULL && current_element->name!=NULL){
     807  if(wait_outputs && current_element!=NULL && current_element->name!=NULL){
    808808    if(my_service->outputs==NULL){ 
    809809#ifdef DEBUG_SERVICE_CONF
     
    834834    current_element=NULL;
    835835  }
    836   int contentOnly=-1;
     836  int contentOnly=false;
    837837  if(current_content!=NULL){
    838838    if(my_service->content==NULL){
    839839      addMapToMap(&my_service->content,current_content);
    840       contentOnly=1;
     840      contentOnly=true;
     841      wait_maincontent=false;
    841842    }
    842843    freeMap(&current_content);
     
    848849  dumpService(my_service);
    849850#endif
    850   if(contentOnly<0 && ((wait_outputs<0 && current_data==2 && my_service->outputs==NULL) || my_service==NULL || my_service->name==NULL || my_service->content==NULL)){
     851  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))){
    851852    setMapInMaps(conf,"lenv","message",srlval.chaine);
    852853#ifndef WIN32
Note: See TracChangeset for help on using the changeset viewer.

Search

Context Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png