Changeset 917 for trunk/zoo-project/zoo-kernel/service_internal_ruby.c
- Timestamp:
- May 7, 2019, 2:17:08 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property
svn:mergeinfo
set to
False
/branches/prototype-v0 merged eligible
-
Property
svn:mergeinfo
set to
False
-
trunk/zoo-project/zoo-kernel/service_internal_ruby.c
r790 r917 260 260 int hasSize=0; 261 261 map* isArray=getMap(tmp,"isArray"); 262 map* useFile=getMap(tmp,"use_file"); 262 263 map* size=getMap(tmp,"size"); 263 264 map* tmap=getMapType(tmp); … … 271 272 VALUE mvalue=rb_ary_new2(cnt); 272 273 VALUE svalue=rb_ary_new2(cnt); 274 VALUE cvalue=rb_ary_new2(cnt); 273 275 274 276 for(int i=0;i<cnt;i++){ … … 276 278 map* vMap=getMapArray(tmp,"value",i); 277 279 map* sMap=getMapArray(tmp,"size",i); 280 map* uMap=getMapArray(tmp,"use_file",i); 281 map* cMap=getMapArray(tmp,"cache_file",i); 278 282 279 283 if(vMap!=NULL){ … … 281 285 VALUE lvalue; 282 286 VALUE lsvalue; 283 if(sMap==NULL){ 287 VALUE lcvalue; 288 if(sMap==NULL || uMap==NULL){ 284 289 lvalue=rb_str_new2(vMap->value); 285 lsvalue=Qnil; 290 if(sMap==NULL) 291 lsvalue=Qnil; 292 else 293 lsvalue=rb_str_new2(sMap->value); 286 294 } 287 295 else{ … … 290 298 hasSize=1; 291 299 } 300 if(uMap!=NULL) 301 lcvalue=rb_str_new2(cMap->value); 302 else 303 lcvalue=Qnil; 292 304 293 305 rb_ary_push(value,lvalue); 294 306 rb_ary_push(svalue,lsvalue); 307 rb_ary_push(cvalue,lcvalue); 295 308 } 296 309 … … 308 321 rb_hash_aset(res, name, mvalue); 309 322 rb_hash_aset(res, rb_str_new2(tmap->name), mvalue); 323 VALUE lname0=rb_str_new2("cache_size"); 324 rb_hash_aset(res, lname0, value); 310 325 311 326 if(hasSize>0){
Note: See TracChangeset
for help on using the changeset viewer.