Changeset 581 for trunk/zoo-project/zoo-kernel
- Timestamp:
- Feb 12, 2015, 11:44:48 PM (10 years ago)
- Location:
- trunk/zoo-project/zoo-kernel
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/zoo-project/zoo-kernel/service_internal_js.c
r580 r581 105 105 * @param inputs the maps containing the inputs 106 106 * @param outputs the maps containing the outputs 107 * @return ZOO_SERVICE_SUCCEEDED or ZOO_SERVICE_FAILED if the service run, -1107 * @return SERVICE_SUCCEEDED or SERVICE_FAILED if the service run, -1 108 108 * if the service failed to load or throw error at runtime. 109 109 */ … … 959 959 * @param argv1 the parameter values 960 960 * @return true 961 * @see setHeader 961 * @see setHeader,_updateStatus 962 962 */ 963 963 JSBool -
trunk/zoo-project/zoo-kernel/service_internal_python.c
r580 r581 613 613 * @param self the Python object on which we can run the method 614 614 * @param args the Python arguments given from the Python environment 615 * @return a new Python string containing the translated value to the Python 616 * environment 615 * @return a new Python string containing the translated value 617 616 * @see _ss 618 617 */ -
trunk/zoo-project/zoo-kernel/service_internal_ruby.c
r459 r581 1 /* *1 /* 2 2 * Author : Gérald FENOY 3 3 * … … 30 30 #endif 31 31 32 /** 33 * Load a Ruby file then run the function corresponding to the service by 34 * passing the conf, inputs and outputs parameters by value as JavaScript 35 * Objects. 36 * 37 * @param main_conf the conf maps containing the main.cfg settings 38 * @param request the map containing the HTTP request 39 * @param s the service structure 40 * @param real_inputs the maps containing the inputs 41 * @param real_outputs the maps containing the outputs 42 * @return SERVICE_SUCCEEDED or SERVICE_FAILED if the service run, -1 43 * if the service failed to load or throw error at runtime. 44 */ 32 45 int zoo_ruby_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){ 33 46 #if RUBY_API_VERSION_MAJOR >= 2 || RUBY_API_VERSION_MINOR == 9 … … 125 138 } 126 139 140 /** 141 * Load a ruby file 142 * 143 * @arg the file to load 144 * @return Qnil 145 */ 127 146 VALUE LoadWrap(VALUE arg) { 128 147 const char *filename = reinterpret_cast<const char*>(arg); … … 131 150 } 132 151 152 /** 153 * Call a ruby function with parameters 154 * 155 * @arg the callback structure 156 * @return the value returned the called ruby function 157 */ 133 158 VALUE FunCallWrap(VALUE rdata) { 134 159 struct my_callback* data = (struct my_callback*) rdata; … … 136 161 } 137 162 163 /** 164 * Print the Ruby Stack Trace in an ows:ExceptionReport XML Document 165 * 166 * @param m the conf maps containing the main.cfg settings 167 * @see printExceptionReportResponse 168 */ 138 169 void ruby_trace_error(maps* m){ 139 170 #if RUBY_VERSION_MINOR == 8 … … 174 205 } 175 206 207 /** 208 * Convert a maps to a Ruby Hash 209 * 210 * @param t the maps to convert 211 * @return a new Ruby Hash 212 */ 176 213 VALUE RubyHash_FromMaps(maps* t){ 177 214 VALUE res=rb_hash_new(); … … 186 223 } 187 224 225 /** 226 * Push the key on the array 227 * 228 * @param key the key to push 229 * @param value not used 230 * @param ary the Array 231 * @return ST_CONTINUE 232 */ 188 233 int 189 234 keys_i(VALUE key,VALUE value,VALUE ary) … … 194 239 } 195 240 241 /** 242 * Return the size of a Ruby Hash 243 * 244 * @param hash the input Hash 245 */ 196 246 VALUE 197 247 rb_hash_size(VALUE hash) … … 200 250 } 201 251 252 /** 253 * Convert a map to a Ruby Hash 254 * 255 * @param t the map to convert 256 * @return a new Ruby Hash 257 */ 202 258 VALUE RubyHash_FromMap(map* t){ 203 259 VALUE res=rb_hash_new( ); … … 277 333 } 278 334 279 335 /** 336 * Convert a Ruby Hash to a maps 337 * 338 * @param t the Ruby Hash to convert 339 * @return a new maps 340 */ 280 341 maps* mapsFromRubyHash(VALUE t){ 281 342 maps* res=NULL; … … 309 370 } 310 371 372 /** 373 * Convert a Ruby Hash to a map 374 * 375 * @param t the Ruby Hash to convert 376 * @return a new map 377 */ 311 378 map* mapFromRubyHash(VALUE t){ 312 379 map* res=NULL; … … 354 421 } 355 422 423 /** 424 * Use the ZOO-Services messages translation function from the Ruby 425 * environment (ZOO-API) 426 * 427 * @param argc the number of parameters 428 * @param argv the parameter values given from the Ruby environment 429 * @param obj the Ruby object on which we run the method 430 * @return a new Ruby string containing the translated value 431 * @see _ss 432 */ 356 433 VALUE 357 434 RubyTranslate(int argc, VALUE *argv, VALUE obj) … … 360 437 } 361 438 439 /** 440 * Update the ongoing status of a running service from the Ruby environment 441 * (ZOO-API) 442 * 443 * @param argc the number of parameters 444 * @param argv the parameter values given from the Ruby environment 445 * @param obj the Ruby object on which we run the method 446 * @return a new Ruby string containing the translated value 447 * @see _updateStatus 448 */ 362 449 VALUE 363 450 RubyUpdateStatus(int argc, VALUE *argv, VALUE obj) … … 392 479 else 393 480 setMapInMaps(conf,"lenv","status","15"); 394 updateStatus(conf);481 _updateStatus(conf); 395 482 } 396 483 freeMaps(&conf); -
trunk/zoo-project/zoo-kernel/service_internal_ruby.h
r453 r581 1 /* *1 /* 2 2 * Author : Gérald FENOY 3 3 *
Note: See TracChangeset
for help on using the changeset viewer.