Changeset 820 for trunk/zoo-project/zoo-kernel/server_internal.c
- Timestamp:
- Apr 28, 2017, 6:00:52 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/server_internal.c
r805 r820 662 662 if(tmpMaps2->content==NULL) 663 663 tmpMaps2->content=createMap(tmpm->name,tmpm->value); 664 else 664 else{ 665 665 addToMap(tmpMaps2->content,tmpm->name,tmpm->value); 666 } 666 667 tmpm=tmpm->next; 667 668 } 668 669 } 669 addToMap(tmpMaps2->content,"inRequest","false"); 670 if(tmpMaps2->content==NULL){ 671 tmpMaps2->content=createMap("inRequest","false"); 672 dumpMaps(tmpMaps2); 673 } 674 else 675 addToMap(tmpMaps2->content,"inRequest","false"); 670 676 if(type==0){ 671 677 map *tmpMap=getMap(tmpMaps2->content,"value"); … … 673 679 addToMap(tmpMaps2->content,"value","NULL"); 674 680 } 681 elements* tmpElements=getElements(in,tmpMaps2->name); 682 if(tmpElements!=NULL && tmpElements->child!=NULL){ 683 char *res=addDefaultValues(&tmpMaps2->child,tmpElements->child,m,type,err); 684 if(strlen(res)>0){ 685 return res; 686 } 687 } 688 675 689 if(out1==NULL){ 676 690 *out=dupMaps(&tmpMaps2); … … 687 701 } 688 702 } 689 else {703 else { 690 704 iotype* tmpIoType=NULL; 691 705 if(tmpMaps->content!=NULL){ … … 820 834 addToMap(tmpMaps->content,"inRequest","true"); 821 835 elements* tmpElements=getElements(in,tmpMaps->name); 822 if(tmp Maps->child!=NULL && tmpElements!=NULL && tmpElements->child!=NULL){836 if(tmpElements!=NULL && tmpElements->child!=NULL){ 823 837 char *res=addDefaultValues(&tmpMaps->child,tmpElements->child,m,type,err); 824 838 if(strlen(res)>0){ 825 fprintf(stderr,"%s %d\n",__FILE__,__LINE__);826 839 return res; 827 840 } 828 841 } 829 842 } 830 if(tmpInputs->child!=NULL){ 831 tmpInputss=tmpInputs->next; 832 tmpInputs=tmpInputs->child; 833 if(tmpMaps!=NULL){ 834 out1=tmpMaps->child; 835 out1s=tmpMaps; 836 } 837 }else 838 tmpInputs=tmpInputs->next; 843 tmpInputs=tmpInputs->next; 839 844 } 840 845 if(tmpInputss!=NULL){
Note: See TracChangeset
for help on using the changeset viewer.