Changeset 752 for trunk/zoo-project/zoo-kernel/service_internal_js.c
- Timestamp:
- Mar 5, 2016, 2:37:06 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/service_internal_js.c
r640 r752 458 458 while(isArray==NULL && tmpm!=NULL){ 459 459 jsval jsstr; 460 if( (isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0))460 if(isBinary!=NULL && strncasecmp(tmpm->name,"value",5)==0) 461 461 jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,atoi(isBinary->value))); 462 462 else … … 473 473 JSObject* values=JS_NewArrayObject( cx, cnt, NULL ); 474 474 JSObject* mvalues=JS_NewArrayObject( cx, cnt, NULL ); 475 map *tmpm1,*tmpm2 ;475 map *tmpm1,*tmpm2,*tmpm3; 476 476 int i=0; 477 477 for(i=0;i<cnt;i++){ 478 478 tmpm1=getMapArray(t,"value",i); 479 479 tmpm2=getMapArray(t,tmap->name,i); 480 tmpm3=getMapArray(t,"size",i); 480 481 if(tmpm1!=NULL){ 481 jsval jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,strlen(tmpm1->value))); 482 jsval jsstr; 483 if(tmpm3!=NULL) 484 jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,atoi(tmpm3->value))); 485 else 486 jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm1->value,strlen(tmpm1->value))); 482 487 JS_SetElement( cx, values, i, &jsstr ); 483 488 } … … 491 496 JS_SetProperty(cx, res,"value",&jvalues); 492 497 JS_SetProperty(cx, res,tmap->name,&jmvalues); 498 while(tmpm!=NULL){ 499 if(strncasecmp(tmpm->name,"value",5)!=0 && strncasecmp(tmpm->name,"size",4)!=0 && strncasecmp(tmpm->name,tmap->name,strlen(tmap->name))!=0){ 500 jsval jsstr = STRING_TO_JSVAL(JS_NewStringCopyN(cx,tmpm->value,strlen(tmpm->value))); 501 JS_SetProperty(cx, res, tmpm->name,&jsstr); 502 } 503 #ifdef JS_DEBUG 504 fprintf(stderr,"[JS] %s => %s\n",tmpm->name,tmpm->value); 505 #endif 506 tmpm=tmpm->next; 507 } 493 508 } 494 509 return res;
Note: See TracChangeset
for help on using the changeset viewer.