Index: trunk/zoo-project/zoo-kernel/Makefile.in =================================================================== --- trunk/zoo-project/zoo-kernel/Makefile.in (revision 790) +++ trunk/zoo-project/zoo-kernel/Makefile.in (revision 794) @@ -86,4 +86,7 @@ gcc -fPIC ${XML2CFLAGS} ${JSCFLAGS} ${CFLAGS} ${JS_ENABLED} -c service_internal_js.c +service_internal_mono.o: service_internal_mono.h service_internal_mono.c service.h + gcc -c ${XML2CFLAGS} ${MONO_CFLAGS} ${CFLAGS} ${MONO_ENABLED} service_internal_mono.c + service_internal_ruby.o: service_internal_ruby.c service_internal_ruby.h g++ ${XML2CFLAGS} ${RUBYCFLAGS} ${CFLAGS} ${JSCFLAGS} ${JS_ENABLED} -c service_internal_ruby.c @@ -92,6 +95,6 @@ g++ -c ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} service_loader.c -zoo_service_loader.o: zoo_service_loader.c service.h version.h ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} - g++ -g -O2 ${XML2CFLAGS} ${CFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${SAGA_ENABLED} ${OTB_ENABLED} ${PYTHON_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} -c zoo_service_loader.c -fno-common -DPIC -o zoo_service_loader.o +zoo_service_loader.o: zoo_service_loader.c service.h version.h ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} + g++ -g -O2 ${XML2CFLAGS} ${CFLAGS} ${MONO_CFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${PYTHONCFLAGS} ${JAVACFLAGS} ${JSCFLAGS} ${PERLCFLAGS} ${PHPCFLAGS} ${SAGA_ENABLED} ${OTB_ENABLED} ${PYTHON_ENABLED} ${JS_ENABLED} ${PHP_ENABLED} ${PERL_ENABLED} ${JAVA_ENABLED} ${MONO_ENABLED} -c zoo_service_loader.c -fno-common -DPIC -o zoo_service_loader.o libzoo_service.${EXT}: version.h service_internal.o service.o sqlapi.o @@ -100,5 +103,5 @@ zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} g++ -g -O2 ${JSCFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${RUBYCFLAGS} ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c -fno-common -DPIC -o zoo_loader.o - g++ ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE} ${PERL_FILE} ${PHP_FILE} ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS} + g++ ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE} ${PERL_FILE} ${PHP_FILE} ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS} zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main_conf_read.tab.o lex.cr.o response_print.o server_internal.o service_internal.o ${MS_FILE} ${YAML_FILE} Index: trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in =================================================================== --- trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in (revision 790) +++ trunk/zoo-project/zoo-kernel/ZOOMakefile.opts.in (revision 794) @@ -96,6 +96,11 @@ SAGA_FILE=@SAGA_FILE@ +MONO_CFLAGS=@MONO_CFLAGS@ +MONO_LDFLAGS=@MONO_LDFLAGS@ +MONO_ENABLED=@MONO_ENABLED@ +MONO_FILE=@MONO_FILE@ + CFLAGS=@RELY_ON_DB@ @DEB_DEF@ -fpic @OPENSSL_CFLAGS@ ${FCGI_CFLAGS} ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF -LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} +LDFLAGS=-lzoo_service @DEFAULT_LIBS@ -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS} ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} ${FCGI_LDFLAGS} @OPENSSL_LDFLAGS@ -luuid ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${MACOS_LD_NET_FLAGS} ${YAML_LDFLAGS} ${OTBLDFLAGS} ${SAGA_LDFLAGS} ${MONO_LDFLAGS} DATAROOTDIR=@datarootdir@/zoo-project Index: trunk/zoo-project/zoo-kernel/configure.ac =================================================================== --- trunk/zoo-project/zoo-kernel/configure.ac (revision 790) +++ trunk/zoo-project/zoo-kernel/configure.ac (revision 794) @@ -637,4 +637,51 @@ # =========================================================================== +# Detect if mono is installed +# =========================================================================== + +AC_ARG_WITH([mono], + [AS_HELP_STRING([--with-mono=PATH], [To enable mono support, specify the path to find pkg-config, disabled by default])], + [MONOHOME="$withval"; MONO_ENABLED="-DUSE_MONO"], [MONO_ENABLED=""]) + +if test -z "$MONO_ENABLED" +then + MONO_FILE="" +else + MONO_FILE="service_internal_mono.o" + if test "x$MONOHOME" = "x"; + then + MONOHOME="/usr" + fi + if test "x$MONOHOME" = "xyes"; + then + MONOHOME="/usr" + fi + + # Extract the linker and include flags + MONO_CFLAGS=`$MONOHOME/bin/pkg-config --cflags mono-2` + MONO_LDFLAGS=`$MONOHOME/bin/pkg-config --libs mono-2` + + AC_LANG([C++]) + echo $JAVA_CPPFLAGS + # Check headers file (second time we check that in fact) + CPPFLAGS_SAVE="$CFLAGS" + CPPFLAGS="$MONO_CFLAGS" + AC_CHECK_HEADERS([mono/jit/jit.h], + [], [AC_MSG_ERROR([could not find jit.h file])]) + CPPFLAGS="$CPPFLAGS_SAVE" + # Ensure we can link against libmono-2.0 + LIBS_SAVE="$LIBS" + LIBS="$MONO_LDFLAGS" + AC_CHECK_LIB([mono-2.0], [mono_runtime_invoke], [], [AC_MSG_ERROR([could not find libmono])], []) + LIBS="$LIBS_SAVE" + + AC_SUBST([MONO_CFLAGS]) + AC_SUBST([MONO_LDFLAGS]) +fi + +AC_SUBST([MONO_ENABLED]) +AC_SUBST([MONO_FILE]) + +# =========================================================================== # Detect if ruby is installed # =========================================================================== Index: trunk/zoo-project/zoo-kernel/request_parser.c =================================================================== --- trunk/zoo-project/zoo-kernel/request_parser.c (revision 790) +++ trunk/zoo-project/zoo-kernel/request_parser.c (revision 794) @@ -1627,6 +1627,6 @@ cgiFilePtr file; int targetFile; - char storageNameOnServer[2048]; - char fileNameOnServer[64]; + char *storageNameOnServer; + char *fileNameOnServer; char contentType[1024]; char buffer[1024]; @@ -1651,6 +1651,8 @@ break; } + fileNameOnServer=(char*)malloc((strlen(name) - t - 1 )*sizeof(char)); strcpy (fileNameOnServer, name + t + 1); + storageNameOnServer=(char*)malloc((strlen(path->value) + strlen(fileNameOnServer) + 2)*sizeof(char)); sprintf (storageNameOnServer, "%s/%s", path->value, fileNameOnServer); @@ -1683,4 +1685,6 @@ cgiFormFileClose (file); close (targetFile); + free(fileNameOnServer); + free(storageNameOnServer); #ifdef DEBUG fprintf (stderr, "File \"%s\" has been uploaded", Index: trunk/zoo-project/zoo-kernel/service.c =================================================================== --- trunk/zoo-project/zoo-kernel/service.c (revision 790) +++ trunk/zoo-project/zoo-kernel/service.c (revision 794) @@ -515,5 +515,6 @@ free(tmp->value); tmp->value=(char*)malloc((size+1)*sizeof(char)); - memmove(tmp->value,v,size*sizeof(char)); + if(v!=NULL) + memmove(tmp->value,v,size*sizeof(char)); tmp->value[size]=0; char sin[128]; Index: trunk/zoo-project/zoo-kernel/service_internal_mono.c =================================================================== --- trunk/zoo-project/zoo-kernel/service_internal_mono.c (revision 794) +++ trunk/zoo-project/zoo-kernel/service_internal_mono.c (revision 794) @@ -0,0 +1,377 @@ +/* + * Author : Gérald FENOY + * + * ref. http://www.mono-project.com/docs/advanced/embedding/ + * http://www.mono-project.com/docs/advanced/pinvoke/ + * http://www.giorgosdimtsas.net/embedding-mono-in-your-c-application/ + * + * Copyright (c) 2009-2013 GeoLabs SARL + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "service_internal_mono.h" +#include "response_print.h" + +/** + * Load a Mono dll then run the static public method corresponding to the + * service by passing the conf, inputs and outputs parameters. + * + * @param main_conf the conf maps containing the main.cfg settings + * @param request the map containing the HTTP request + * @param s the service structure + * @param real_inputs the maps containing the inputs + * @param real_outputs the maps containing the outputs + */ +int zoo_mono_support(maps** main_conf,map* request,service* s,maps **real_inputs,maps **real_outputs){ + maps* m=*main_conf; + maps* inputs=*real_inputs; + maps* outputs=*real_outputs; + char *ntmp=NULL; + map* tmp=getMap(request,"metapath"); + char *classpath; + char *oclasspath; + int res=SERVICE_FAILED; + MonoAssembly* assembly; + MonoImage* monoImage; + + char* libPath="/usr/lib"; + char* etcPath="/etc"; + map* libPathMap=getMapFromMaps(*main_conf,"mono","lib"); + map* etcPathMap=getMapFromMaps(*main_conf,"mono","etc"); + if(libPathMap!=NULL) + libPath=libPathMap->value; + if(etcPathMap!=NULL) + etcPath=etcPathMap->value; + + mono_set_dirs(libPath,etcPath); + + map* configMap=getMapFromMaps(*main_conf,"mono","config"); + if(configMap!=NULL) + mono_config_parse(configMap->value); + else + mono_config_parse(NULL); + + MonoDomain* monoDomain = mono_jit_init_version("ZOO_Embedded_Domain", + "v4.0.30319"); + + map* cwdMap=getMapFromMaps(*main_conf,"main","servicePath"); + if(cwdMap==NULL) + cwdMap=getMapFromMaps(*main_conf,"lenv","cwd"); + + char *zooAssembly=(char*)malloc((strlen(cwdMap->value)+11)*sizeof(char)); + sprintf(zooAssembly,"%s/ZMaps.dll",cwdMap->value); + assembly = mono_domain_assembly_open(monoDomain,zooAssembly); + if(assembly==NULL){ + setMapInMaps(*main_conf,"lenv","message",_("The ZMaps.dll assembly cannot be found!")); + return 4; + } + mono_add_internal_call ("ZOO_API::Translate", MonoTranslate); + mono_add_internal_call ("ZOO_API::UpdateStatus", MonoUpdateStatus); + + monoImage = mono_assembly_get_image(assembly); + MonoClass *KeysList = mono_class_from_name(monoImage, "ZooGenerics", "KeysList"); + MonoClass *ZMapsClass = mono_class_from_name(monoImage, "ZooGenerics", "ZMaps"); + MonoMethod *ZMapsAdd = mono_class_get_method_from_name(ZMapsClass, "addToMaps", 2); + MonoMethod *ZMapsGetMaps = mono_class_get_method_from_name(ZMapsClass, "getMaps", 1); + MonoClass *_ZMapsClass = mono_class_from_name(monoImage, "ZooGenerics", "_ZMaps"); + MonoMethod *_ZMapsSetContent = mono_class_get_method_from_name(_ZMapsClass, "setContent", 1); + MonoMethod *_ZMapsSetChild = mono_class_get_method_from_name(_ZMapsClass, "setChild", 1); + MonoMethod *_ZMapsGetContent = mono_class_get_method_from_name(_ZMapsClass, "getContent", 0); + MonoMethod *_ZMapsGetChild = mono_class_get_method_from_name(_ZMapsClass, "getChild", 0); + MonoClass *ZMapClass = mono_class_from_name(monoImage, "ZooGenerics", "ZMap"); + MonoMethod *ZMapGetMap = mono_class_get_method_from_name(ZMapClass, "getMap", 1); + MonoMethod *ZMapAdd = mono_class_get_method_from_name(ZMapClass, "addToMap", 2); + MonoMethod *ZMapDisplay = mono_class_get_method_from_name(ZMapClass, "display", 1); + MonoObject *exc=NULL; + + MonoClass *classes[3]={_ZMapsClass,ZMapsClass,ZMapClass}; + MonoMethod *methods[5]={ZMapsAdd,_ZMapsSetContent,_ZMapsSetChild,ZMapAdd,ZMapDisplay}; + + MonoMethod *ZMapsGetKeys = mono_class_get_method_from_name(ZMapsClass, "getKeys", 0); + MonoMethod *ZMapsGetKeysCount = mono_class_get_method_from_name(ZMapsClass, "getKeysCount", 0); + MonoMethod *ZMapsGetKey = mono_class_get_method_from_name(ZMapsClass, "getKey", 1); + MonoMethod *ZMapGetKeys = mono_class_get_method_from_name(ZMapClass, "getKeys", 0); + MonoClassField *ZMapKeys = mono_class_get_field_from_name(ZMapClass, "Keys"); + MonoMethod *ZMapGetKeysCount = mono_class_get_method_from_name(ZMapClass, "getKeysCount", 0); + MonoMethod *ZMapGetKey = mono_class_get_method_from_name(ZMapClass, "getKey", 1); + MonoMethod *ZMapGetSize = mono_class_get_method_from_name(ZMapClass, "getSize", 0); + MonoMethod *ZMapGetMapAsBytes = mono_class_get_method_from_name(ZMapClass, "getMapAsBytes", 0); + MonoClass *oclasses[4]={_ZMapsClass,ZMapsClass,ZMapClass,KeysList}; + MonoMethod *omethods[10]={ZMapsGetMaps,ZMapsGetKeysCount,ZMapsGetKey,ZMapGetMap,ZMapGetKeysCount,ZMapGetKey,_ZMapsGetContent,_ZMapsGetChild,ZMapGetSize,ZMapGetMapAsBytes}; + + for(int i=0;i<4;i++){ + iclasses[i]=oclasses[i]; + imethods[i]=omethods[i]; + } + for(int i=4;i<10;i++) + imethods[i]=omethods[i]; + + void *args[3]; + + MonoObject * main=ZMapsFromMaps(monoDomain,classes,methods,&exc,m); + + MonoObject * in=ZMapsFromMaps(monoDomain,classes,methods,&exc,inputs); + + MonoObject * out=ZMapsFromMaps(monoDomain,classes,methods,&exc,outputs); + + args [0] = main; + args [1] = in; + args [2] = out; + + tmp=getMap(s->content,"serviceProvider"); + char *sName=(char*)malloc((strlen(tmp->value)+strlen(cwdMap->value)+2)*sizeof(char)); + sprintf(sName,"%s/%s",cwdMap->value,tmp->value); + MonoAssembly* serviceAssembly = mono_domain_assembly_open(monoDomain,sName); + if(serviceAssembly==NULL){ + char *msg=(char*)malloc((strlen(_("Your service assembly: %s cannot be found!"))+strlen(tmp->value)+1)*sizeof(char)); + sprintf(msg,_("Your service assembly %s cannot be found!"),tmp->value); + setMapInMaps(*main_conf,"lenv","message",msg); + free(msg); + return 4; + } + + MonoImage* serviceImage = mono_assembly_get_image(serviceAssembly); + + map* tmp1=getMap(s->content,"serviceNameSpace"); + tmp=getMap(s->content,"serviceClass"); + MonoClass *serviceClass = mono_class_from_name(serviceImage, tmp1->value, tmp->value); + if(serviceClass==NULL){ + char *msg=(char*)malloc((strlen(_("Your service class method %s::%s cannot be found!"))+strlen(tmp1->value)+strlen(tmp->value)+1)*sizeof(char)); + sprintf(msg,_("Your service class method %s::%s cannot be found!"),tmp1->value,tmp->value); + setMapInMaps(*main_conf,"lenv","message",msg); + free(msg); + return 4; + } + MonoMethod *serviceFunction = mono_class_get_method_from_name(serviceClass, s->name, 3); + if(serviceFunction==NULL){ + char *msg=(char*)malloc((strlen(_("Your service static method %s cannot be found!"))+strlen(s->name)+1)*sizeof(char)); + sprintf(msg,_("Your service static method %s cannot be found!"),s->name); + setMapInMaps(*main_conf,"lenv","message",msg); + free(msg); + return 4; + } + MonoObject *exception=NULL; + MonoObject *result = mono_runtime_invoke(serviceFunction,NULL,args,&exception); + res=*(int*)mono_object_unbox (result); + if(res==3){ + freeMaps(&outputs); + free(outputs); + outputs=mapsFromZMaps(monoDomain,oclasses,omethods,args[2]); + *real_outputs=outputs; + } + freeMaps(&m); + free(m); + m=mapsFromZMaps(monoDomain,oclasses,omethods,args[0]); + *main_conf=m; + mono_jit_cleanup (monoDomain); + return res; +} + +/** + * Create ZMaps from maps + * @param domain the Mono Domain + * @param classes the Mono classes required to create (_ZMaps,ZMaps and ZMap) + * @param methods the Mono methods required (ZMapsAdd, _ZMapsSetContent, _ZMapsSetChild, ZMapAdd and ZMapDisplay) + * @param m the maps to use as source to create the corresponding ZMaps + * @return MonoObject* to a new ZMap + */ +MonoObject* ZMapsFromMaps(MonoDomain* domain,MonoClass **classes,MonoMethod **methods,MonoObject **exc,maps* m){ + MonoObject *res=mono_object_new(domain,classes[1]); + MonoMethod* constructorMethod = mono_class_get_method_from_name(classes[1], + ".ctor", + 0); + mono_runtime_invoke(constructorMethod, res, NULL, exc); + MonoMethod* constructorMethod1 = mono_class_get_method_from_name(classes[0], + ".ctor", + 0); + + while(m!=NULL){ + MonoObject *tmpRes=mono_object_new(domain,classes[0]); + mono_runtime_invoke(constructorMethod1, tmpRes, NULL, exc); + void *values0 [1]; + MonoObject* content = ZMapFromMap (domain,classes[2],methods,exc,m->content); + values0 [0] = content; + MonoObject *exception=NULL; + mono_runtime_invoke(methods[1],tmpRes,values0,&exception); + if(exception!=NULL) + { + fprintf(stderr,"ERROR : %s\n", mono_string_to_utf8(mono_object_to_string(exception, NULL))); + fflush(stderr); + return res; + } + if(m->child!=NULL){ + void *values [1]; + values [0] = ZMapsFromMaps (domain,classes,methods,exc,m->child); + mono_runtime_invoke(methods[2],tmpRes,values,exc); + } + void *values [2]; + values [0] = mono_string_new (domain, m->name); + values [1] = tmpRes; + mono_runtime_invoke(methods[0],res,values,exc); + m=m->next; + } + return res; +} + +/** + * Create ZMap from map + * @param domain the Mono Domain + * @param classes the Mono classes required to create (_ZMaps,ZMaps and ZMap) + * @param methods the Mono methods required (ZMapsAdd, _ZMapsSetContent, _ZMapsSetChild, ZMapAdd and ZMapDisplay) + * @param exc the Mono exception object + * @param m the map to use as source to create a new ZMap + * @return MonoObject* to a new ZMap + */ +MonoObject* ZMapFromMap(MonoDomain* domain,MonoClass *ZMapClass,MonoMethod **methods,MonoObject **exc,map* m){ + MonoObject *res=mono_object_new(domain,ZMapClass); + MonoMethod* constructorMethod = mono_class_get_method_from_name(ZMapClass, + ".ctor", + 0); + mono_runtime_invoke(constructorMethod, res, NULL, exc); + map* sizeMap=getMap(m,"size"); + while(m!=NULL){ + void *values [2]; + MonoString* name = mono_string_new(domain, m->name); + MonoString* value; + if(sizeMap!=NULL && strcasecmp(m->name,"value")==0) + value = mono_string_new_len(domain, m->value,atoi(sizeMap->value)); + else + value = mono_string_new(domain, m->value); + values [0] = name; + values [1] = value; + mono_runtime_invoke(methods[3],res,values,exc); + m=m->next; + } + return res; +} + +/** + * Create maps from ZMaps + * @param domain the Mono Domain + * @param classes the Mono classes required to create (_ZMapsClass,ZMapsClass,ZMapClass,KeysList) + * @param methods the Mono methods required (ZMapsGetMaps,ZMapsGetKeysCount,ZMapsGetKey,ZMapGetMap,ZMapGetKeysCount,ZMapGetKey,_ZMapsGetContent,_ZMapsGetChild) + * @param m the ZMaps to use as source to create a new maps + * @return MonoObject* to a new ZMaps + */ +maps* mapsFromZMaps(MonoDomain* domain,MonoClass **classes,MonoMethod **methods,MonoObject* m){ + maps* res=NULL; + if(m!=NULL){ + MonoObject *exc=NULL; + MonoObject *okeys = mono_runtime_invoke(methods[1],m,NULL,&exc); + if(exc!=NULL) + { + fprintf(stderr,"ERROR : %s\n", mono_string_to_utf8(mono_object_to_string(exc, NULL))); + fflush(stderr); + return res; + } + + int keyCount=*(int*)mono_object_unbox (okeys); + for(int i=0;icontent=mapFromZMap(domain,classes,methods,content); + MonoObject *childs = mono_runtime_invoke(methods[7],content_ZMaps,NULL,&exc); + tmp->child=mapsFromZMaps(domain,classes,methods,childs); + if(res==NULL){ + res=dupMaps(&tmp); + }else + addMapsToMaps(&res,tmp); + freeMaps(&tmp); + free(tmp); + mono_free(key); + } + } + return res; +} + +/** + * Create map from ZMap + * @param domain the Mono Domain + * @param classes the Mono classes required (_ZMapsClass,ZMapsClass,ZMapClass,KeysList) + * @param methods the Mono methods required (ZMapsGetMaps,ZMapsGetKeysCount,ZMapsGetKey,ZMapGetMap,ZMapGetKeysCount,ZMapGetKey,_ZMapsGetContent,_ZMapsGetChild,ZMapGetSize) + * @param m the ZMap to use as source to create a new map + * @return MonoObject* to a new ZMap + */ +map* mapFromZMap(MonoDomain* domain,MonoClass **classes,MonoMethod **methods,MonoObject* m){ + map* res=NULL; + if(m!=NULL){ + MonoObject *exc = NULL; + MonoObject *okeys = mono_runtime_invoke(methods[4],m,NULL,&exc); + int keyCount=*(int*)mono_object_unbox (okeys); + MonoObject *osize = mono_runtime_invoke(methods[8],m,NULL,&exc); + int size=*(int*)mono_object_unbox (osize); + for(int i=0;i 100){ + tmp=-1; + } + char tmpStatus[5]; + snprintf(tmpStatus, 4, "%d", tmp); + setMapInMaps(confMaps,"lenv","status",(char*)tmpStatus); + _updateStatus(confMaps); + freeMaps(&confMaps); + free(confMaps); + return; +} Index: trunk/zoo-project/zoo-kernel/service_internal_mono.h =================================================================== --- trunk/zoo-project/zoo-kernel/service_internal_mono.h (revision 794) +++ trunk/zoo-project/zoo-kernel/service_internal_mono.h (revision 794) @@ -0,0 +1,54 @@ +/* + * Author : Gérald FENOY + * + * Copyright (c) 2009-2010 GeoLabs SARL + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#ifndef ZOO_SERVICE_INTERNAL_CSHARP_H +#define ZOO_SERVICE_INTERNAL_CSHARP_H 1 + +#pragma once + +#include "service.h" +#include "service_internal.h" +#include +#include +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + + int zoo_mono_support(maps**,map*,service*,maps**,maps**); + MonoObject* ZMapsFromMaps(MonoDomain*,MonoClass**,MonoMethod**,MonoObject**,maps*); + MonoObject* ZMapFromMap(MonoDomain*,MonoClass*,MonoMethod**,MonoObject**,map*); + maps* mapsFromZMaps(MonoDomain*,MonoClass**,MonoMethod**,MonoObject*); + map* mapFromZMap(MonoDomain*,MonoClass**,MonoMethod**,MonoObject*); + static MonoString* MonoTranslate(MonoString*); + static void MonoUpdateStatus(MonoObject*,MonoString*,int*); + MonoClass *iclasses[4]; + MonoMethod *imethods[10]; + +#ifdef __cplusplus +} +#endif +#endif Index: trunk/zoo-project/zoo-kernel/zoo_service_loader.c =================================================================== --- trunk/zoo-project/zoo-kernel/zoo_service_loader.c (revision 790) +++ trunk/zoo-project/zoo-kernel/zoo_service_loader.c (revision 794) @@ -81,4 +81,8 @@ #ifdef USE_PERL #include "service_internal_perl.h" +#endif + +#ifdef USE_MONO +#include "service_internal_mono.h" #endif @@ -705,4 +709,14 @@ *eres = zoo_ruby_support (&m, request_inputs, s1, &request_input_real_format, + &request_output_real_format); + } + else +#endif + +#ifdef USE_MONO + if (strncasecmp (r_inputs->value, "Mono", 4) == 0) + { + *eres = + zoo_mono_support (&m, request_inputs, s1, &request_input_real_format, &request_output_real_format); }