Changeset 790 for trunk/zoo-project/zoo-kernel/service_internal_js.c
- Timestamp:
- Dec 19, 2016, 6:01:06 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/service_internal_js.c
r784 r790 425 425 while(tmp!=NULL){ 426 426 JSObject *pval=JSObject_FromMap(cx,tmp->content); 427 if(tmp->child!=NULL){ 428 JSObject *pvalc=JSObject_FromMaps(cx,tmp->child); 429 jsval pvaljc=OBJECT_TO_JSVAL(pvalc); 430 JS_SetProperty(cx, pval, "child", &pvaljc); 431 } 427 432 jsval pvalj=OBJECT_TO_JSVAL(pval); 428 433 JS_SetProperty(cx, res, tmp->name, &pvalj); … … 548 553 549 554 tmp=JS_EncodeString(cx,jsmsg); 550 tres=(maps*)malloc(MAPS_SIZE); 551 tres->name=zStrdup(tmp); 552 tres->content=NULL; 553 tres->next=NULL; 555 tres=createMaps(tmp); 554 556 555 557 jsval nvp=JSVAL_NULL; … … 567 569 } 568 570 571 jsval nvp0=JSVAL_NULL; 572 JSObject *nvp01=JSVAL_TO_OBJECT(JSVAL_NULL); 573 if((JS_GetProperty(cx, nvp1, "child", &nvp0)==JS_FALSE)){ 574 #ifdef JS_DEBUG 575 fprintf(stderr,"Enumerate id : %d => %s => No more value\n",oi,tmp); 576 #endif 577 } 578 JS_ValueToObject(cx,nvp0,&nvp01); 579 jsval nvp01j=OBJECT_TO_JSVAL(nvp01); 580 if(!JSVAL_IS_NULL(nvp01j)){ 581 tres->child=mapsFromJSObject(cx,nvp01j); 582 } 583 569 584 if(res==NULL) 570 585 res=dupMaps(&tres); … … 574 589 free(tres); 575 590 tres=NULL; 576 577 591 } 578 592 JS_DestroyIdArray(cx,idp); … … 725 739 fprintf(stderr,"Enumerate id : %d [ %s => %s ]\n",index,tmp,tmp1); 726 740 #endif 727 if(res!=NULL){ 728 #ifdef JS_DEBUG 729 fprintf(stderr,"%s - %s\n",tmp,tmp1); 730 #endif 731 addToMap(res,tmp,tmp1); 732 } 733 else{ 734 res=createMap(tmp,tmp1); 735 res->next=NULL; 741 if(strcasecmp(tmp,"child")!=0){ 742 if(res!=NULL){ 743 #ifdef JS_DEBUG 744 fprintf(stderr,"%s - %s\n",tmp,tmp1); 745 #endif 746 addToMap(res,tmp,tmp1); 747 } 748 else{ 749 res=createMap(tmp,tmp1); 750 res->next=NULL; 751 } 736 752 } 737 753 free(tmp);
Note: See TracChangeset
for help on using the changeset viewer.