Changeset 65 for trunk/zoo-kernel/service_conf.y
- Timestamp:
- Jan 8, 2011, 2:12:24 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-kernel/service_conf.y
r60 r65 203 203 dumpElements(my_service->inputs); 204 204 dumpService(my_service); 205 #endif 205 #endif 206 206 if(my_service->inputs==NULL){ 207 207 my_service->inputs=dupElements(current_element); … … 238 238 wait_outputs=true; 239 239 current_data=2; 240 previous_data= 1;240 previous_data=2; 241 241 } 242 242 else … … 587 587 else 588 588 if(current_data==2){ 589 if(wait_inputs==true){ 589 wait_outputs=true; 590 if(wait_inputs){ 590 591 if(current_element!=NULL && current_element->name!=NULL){ 591 if(my_service-> inputs==NULL){592 my_service-> inputs=dupElements(current_element);593 my_service-> inputs->next=NULL;592 if(my_service->outputs==NULL){ 593 my_service->outputs=dupElements(current_element); 594 my_service->outputs->next=NULL; 594 595 } 595 596 else{ … … 597 598 fprintf(stderr,"LAST NAME IN %s (current - %s)\n",$1,current_element->name); 598 599 #endif 599 addToElements(&my_service-> inputs,current_element);600 addToElements(&my_service->outputs,current_element); 600 601 } 601 602 #ifdef DEBUG_SERVICE_CONF … … 624 625 #endif 625 626 char *cen=strdup($1); 626 current_element->name=(char*)malloc((strlen(cen)-1)*sizeof(char *));627 current_element->name=(char*)malloc((strlen(cen)-1)*sizeof(char)); 627 628 cen[strlen(cen)-1]=0; 628 629 cen+=1; … … 637 638 current_element->next=NULL; 638 639 } 639 wait_inputs=false; 640 640 641 current_content=NULL; 641 642 } 642 643 else 643 if(current_element->name==NULL){ 644 if(current_element!=NULL && current_element->name!=NULL){ 645 if(my_service->outputs==NULL) 646 my_service->outputs=dupElements(current_element); 647 else 648 addToElements(&my_service->outputs,current_element); 649 fprintf(stderr,"ADD TO OUTPUTS Elements\n"); 650 dupElements(current_element); 651 652 freeElements(¤t_element); 653 free(current_element); 654 current_element=NULL; 655 } 656 else{ 644 657 #ifdef DEBUG_SERVICE_CONF 645 658 fprintf(stderr,"NAME OUT %s\n",$1); … … 663 676 current_element->next=NULL; 664 677 } 678 wait_inputs=false; 665 679 wait_outputs=true; 680 //wait_outputs=true; 666 681 } 667 682 } … … 724 739 int resultatYYParse = srparse() ; 725 740 726 if(wait_outputs ==true&& current_element!=NULL && current_element->name!=NULL){741 if(wait_outputs && current_element!=NULL && current_element->name!=NULL){ 727 742 if(my_service->outputs==NULL){ 728 743 #ifdef DEBUG_SERVICE_CONF
Note: See TracChangeset
for help on using the changeset viewer.