Changeset 539


Ignore:
Timestamp:
Nov 17, 2014, 3:35:53 PM (10 years ago)
Author:
djay
Message:

Fix yaml service naming. Add javax javaxx optional sections in the main.cfg #105.

Location:
trunk/zoo-project/zoo-kernel
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/zoo-project/zoo-kernel/main.cfg

    r465 r539  
    1 [mm]
    2 biLayerAlias=Carte,Ortophoto,Ortophoto 2005,Parcels,Etat Major,Cassini,Elev
    3 editingToolbar=select,add,edit
    4 navName=Authenticate,Permalink,Twitter sharing,Facebook sharing,Scroll,Pan,Geolocate,Track my position,Zoom Box,Zoom To Max Extent,Identify,Identify Circle,Mesure Distance,Mesure Area,Print,Profile
    5 scales=443744273,221872136,110936068,55468034,27734017,13867008,6933504,3466752,1733376,866688,433344,216672,108336,54168,27084,13542,6771,3385,1692
    6 rasterToolbarAlias=Profile,Contour,Shaded Relief,Color Relief,Slope Map,Clip
    7 supportedDbs=PostGIS,MySQL
    8 mapcacheUrl=http://127.0.0.1/cache/
    9 biLayers=GEOGRAPHICALGRIDSYSTEMS.MAPS,ORTHOIMAGERY.ORTHOPHOTOS,ORTHOIMAGERY.ORTHOPHOTOS2000-2005,CADASTRALPARCELS.PARCELS,GEOGRAPHICALGRIDSYSTEMS.ETATMAJOR40,GEOGRAPHICALGRIDSYSTEMS.CASSINI,ELEVATION.SLOPES
    10 bgLayers=google.maps.MapTypeId.TERRAIN,null,google.maps.MapTypeId.SATELLITE,google.maps.MapTypeId.HYBRID
    11 bpDefault=g
    12 bgName=Google
    13 bbLayers=Road,Aerial,AerialWithLabels
    14 navIcon=auth,permalink,tshare,fshare,scroll,pan,geoloc,track,zoom-in,zoomtomaxextent,info,infocircle,dist,area,print,terrain-profile
    15 bbName=Bing
    16 boLayerAlias=OpenStreetMap
    17 bmLayerAlias=Streets,Satelite
    18 toolbars=Vector
    19 navId=authenticate,permalink,tshare,fshare,scroll,control,geolocate,track,zoomin,zoomtomaxextent,getFeature,getFeatureCircle,line,polygon,print,profile
    20 navIdX=authenticate,permalink,tshare,fshare,zoomtomaxextent,print
    21 navIdXX=scroll
    22 navIdF=loadLoginForm,permalink,shareOnTwitter,shareOnFB,gotoMaxExtent,printIntoDocument
    23 nvIID=getFeature,getFeatureCircle
    24 osmApiUrl=http://open.mapquestapi.com/xapi/api/0.6/
    25 vectorToolbar=buffer,spatial-buffer,centroid,boundary,convexhull,simplify,spatial-query
    26 bmLayers=Map,Aerial
    27 boName=OSM
    28 editingToolbarAlias=Select feature,Add feature,Edit feature
    29 boLayers=OSM
    30 address=http://127.0.0.1/mm
    31 bmName=MapQuest
    32 bpList=g,b,i
    33 uomsName=Foot,Meter,Deegree
    34 adminTheme=green
    35 vectorToolbarAlias=Buffer,BufferMask,Centroid,Boundary,ConvexHull,Simplify,SpatialQuery
    36 mapcacheCfg=/Users/djay/Sites/mapcache.xml
    37 dateFormat=%A %d %B %Y
    38 uomsId=english,metric,geographic
    39 oldToolbars=Editing,Raster
    40 rasterToolbar=profile,contour,shaded_relief,color_relief,slope_map,clip
    41 bgLayerAlias=Physical,Streets,Satelite,Hybrid
    42 bbLayerAlias=Streets,Satelite,Hybrid
    43 sizeLimit=100M
    44 biName=IGN
    45 
    46 [headers]
    47 X-Powered-By=ZOO-Project@MapMint
     1[main]
     2encoding = utf-8
     3version = 1.0.0
     4serverAddress = http://www.zoo-project.org/zoo/
     5lang = fr-FR,en-CA,en-US
     6tmpPath=/tmp/
     7tmpUrl = ../mpPathRelativeToServerAdress/
     8dataPath = /tmp/
     9cacheDir = /tmp/
    4810
    4911[identification]
    50 keywords=WPS,GIS,buffer,MapMint,ZOO-Project
    51 title=ZOO-Project WPS Production Server
    52 abstract=Development version of ZooWPS. See http://www.zoo-project.org
    53 accessConstraints=none
    54 fees=None
     12title = The Zoo WPS Development Server
     13abstract = Development version of ZooWPS. See http://www.zoo-project.org
     14fees = None
     15accessConstraints = none
     16keywords = WPS,GIS,buffer
    5517
    5618[provider]
     19providerName=ZOO Project
     20providerSite=http://www.zoo-project.org
     21individualName=Gerald FENOY
    5722positionName=Developer
    58 providerName=GeoLabs SARL
     23role=Dev
     24addressDeliveryPoint=1280, avenue des Platanes
     25addressCity=Lattes
    5926addressAdministrativeArea=False
    60 addressDeliveryPoint=1280, avenue des Platanes
     27addressPostalCode=34970
    6128addressCountry=fr
    62 phoneVoice=+33 4 67 43 09 95
    63 addressPostalCode=34970
    64 role=Dev
    65 providerSite=http://www.geolabs.fr
     29addressElectronicMailAddress=gerald@geolabs.fr
     30phoneVoice=False
    6631phoneFacsimile=False
    67 addressElectronicMailAddress=gerald@geolabs.fr
    68 addressCity=Lattes
    69 individualName=Gerald FENOY
    7032
    71 [main]
    72 encoding=utf-8
    73 isTrial=true
    74 dataPath=/Users/djay/Sites/data
    75 tmpPath=/Users/djay/Sites/tmp
    76 supportedDbs=PostGIS,MySQL,WFS
    77 cacheDir=/Users/djay/Sites/cache
    78 rootUrl=/~djay/mm-np/public/
    79 publicationUrl=/~djay/pm-np/
    80 dblink=/Users/djay/Sites/mm.db
    81 mmPath=/Users/djay/Sites/mm-np/
    82 sessPath=/Users/djay/Sites/tmp
    83 version=1.0.0
    84 dbuser=npdb
    85 dcount=3
    86 dbuserName=np
    87 3D=false
    88 Rpy2=true
    89 applicationAddress=http://127.0.0.1/~djay/mm-np/
    90 mmAddress=/~djay/mm-np/
    91 publicationPath=/Users/djay/Sites/pm-np/
    92 msOgcVersion=1.0.0
    93 serverAddress=http://127.0.0.1/np-bin/zoo_loader.cgi
    94 lang=fr-FR,en-US,ja-JP
    95 mapserverAddress=http://127.0.0.1/np-bin/mapserv.cgi
    96 tmpUrl=http://127.0.0.1/~djay/tmp/
    97 templatesPath=/Users/djay/Sites/mm-np/templates/
    98 templatesAddress=http://127.0.0.1/~djay/pm-np/tmpl/
    99 crs=IGNF:LAMB93
    100 jsCache=dev
    101 cssCache=prod
    102 cookiePrefix=MMID
    103 
    104 [npdb]
    105 host=127.0.0.1
    106 schema=velo
    107 user=postgres
    108 dbname=demogis
    109 port=5432
    110 
    111 [oo]
    112 external=true
    113 path=/Applications/LibreOffice.app/Contents/program/python
    114 ghostscript=/usr/local/bin/gs

  • trunk/zoo-project/zoo-kernel/service_conf.l

    r476 r539  
    4141
    4242attname [a-zA-Z0-9_\-]+
    43 attvalue1       [\^\*\+,;@a-zA-Z0-9_\-::.:" "\"\'/\\\(\)\t\|\$\&>\[\]]+
     43attvalue1       [\^\*\+,;@a-zA-Z0-9%_\-::.:" "\"\'/\\\(\)\t\|\$\&>\[\]]+
    4444
    4545attvalue                \"[^"]*\"|\'[^']*\'\(\)

  • trunk/zoo-project/zoo-kernel/service_conf.y

    r505 r539  
    515515  fflush(stderr);
    516516#endif
    517   if($1!=NULL){
     517  if($1!=NULL && curr_key!=NULL){
    518518    if(current_content==NULL){
    519519#ifdef DEBUG_SERVICE_CONF

  • trunk/zoo-project/zoo-kernel/service_internal.c

    r514 r539  
    17771777    xmlNewNsProp(nc,ns,BAD_CAST "processVersion",BAD_CAST tmp2->value);
    17781778 
    1779   printDescription(nc,ns_ows,serv->name,serv->content);
     1779  map* tmpI=getMapFromMaps(m,"lenv","oIdentifier");
     1780  printDescription(nc,ns_ows,tmpI->value,serv->content);
    17801781
    17811782  xmlAddChild(n,nc);
    … …  
    33613362
    33623363void parseIdentifier(maps* conf,char* conf_dir,char *identifier,char* buffer){
     3364  setMapInMaps(conf,"lenv","oIdentifier",identifier);
     3365  char *lid=zStrdup(identifier);
    33633366  char *saveptr1;
    3364   char *tmps1=strtok_r(identifier,".",&saveptr1);
     3367  char *tmps1=strtok_r(lid,".",&saveptr1);
    33653368  int level=0;
    33663369  char key[25];
    … …  
    34203423  sprintf(buffer,"%s.zcfg",tmp0);
    34213424  free(tmp0);
     3425  fprintf(stderr,"DEBUG %s\n",lid);
     3426  free(lid);
    34223427}
    34233428
    … …  
    34513456    char size[1024];
    34523457    map* tmp=getMapFromMaps(outputs,parameterName,"value");
     3458    if(tmp==NULL){
     3459      setMapInMaps(outputs,parameterName,"value","");
     3460      tmp=getMapFromMaps(outputs,parameterName,"value");
     3461    }
    34533462    free(tmp->value);
    34543463    tmp->value=(char*) malloc((numberOfBytes+1)*sizeof(char));

  • trunk/zoo-project/zoo-kernel/service_internal_java.c

    r527 r539  
    5151      sprintf(classpath,"%s/%s/",ntmp,tmp->value);
    5252    }
    53     sprintf(oclasspath,"-Djava.class.path=%s",classpath);
    5453  }else{
    5554    if(cclasspath!=NULL){
    … …  
    6766      sprintf(classpath,"%s/",ntmp);
    6867    }
    69     sprintf(oclasspath,"-Djava.class.path=%s",classpath);
    7068
    7169  }
    … …  
    7775#endif
    7876
     77  int nb=1;
     78  int nbc0=0;
     79  maps* javaXXMap=getMaps(main_conf,"javaxx");
     80  if(javaXXMap!=NULL){
     81    nbc0+=count(javaXXMap->content);
     82  }
     83  int nbc1=0;
     84  maps* javaXMap=getMaps(main_conf,"javax");
     85  if(javaXMap!=NULL){
     86    nbc1+=count(javaXMap->content);
     87  }
    7988#ifdef WIN32
    80   JavaVMOption options[2];
    81 #else
    82   JavaVMOption options[1];
     89  nb=2+nbc0+nbc1;
     90  JavaVMOption options[nb];
     91#else
     92  JavaVMOption options[nb+nbc0+nbc1];
    8393#endif
    8494  JavaVMInitArgs vm_args;
    … …  
    95105  jclass cls_gr;
    96106#endif
    97   int i;
    98 
     107  int i,start;
     108  map *cursorxx=NULL;
     109  if(javaXXMap!=NULL)
     110    cursorxx=javaXXMap->content;
     111  map *cursorx=NULL;
     112  if(javaXMap!=NULL)
     113    cursorx=javaXMap->content;
    99114  options[0].optionString = oclasspath;
    100115#ifdef WIN32
     116  start=2;
    101117  options[1].optionString = "-Xmx512m";
    102   /*options[2].optionString = "-Xms128m";
    103   options[3].optionString = "-XX:MaxPermSize=256m";
    104   options[4].optionString = "-XX:MaxHeapFreeRatio=70";*/
    105 #endif
     118#else
     119  start=1;
     120#endif
     121  for(i=0;i<nbc0;i++){
     122    char *tmp=parseJVMXXOption(cursorxx);
     123    options[start+i].optionString = tmp;
     124    free(tmp);
     125    cursorxx=cursorxx->next;
     126  }
     127  for(;i<nbc1+nbc0;i++){
     128    char *tmp=parseJVMXOption(cursorx);
     129    options[start+i].optionString = tmp;
     130    free(tmp);
     131    cursorx=cursorx->next;
     132  }
    106133
    107134  JNI_GetDefaultJavaVMInitArgs(&vm_args);
    108135  vm_args.version = JNI_VERSION_1_6;
    109136  vm_args.options = options;
    110 #ifdef WIN32
    111   vm_args.nOptions = 2;
    112 #else
    113   vm_args.nOptions = 1;
    114 #endif
     137  vm_args.nOptions = start+nbc0+nbc1;
    115138  vm_args.ignoreUnrecognized = JNI_TRUE;
    116139
    … …  
    264287}
    265288
     289char *parseJVMXXOption(map* m){
     290  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
     291  if(strncasecmp(m->value,"minus",5)==0)
     292    sprintf(res,"-XX:-%s",m->name);
     293  else if(strncasecmp(m->value,"plus",5)==0)
     294    sprintf(res,"-XX:+%s",m->name);
     295  else
     296    sprintf(res,"-XX:%s=%s",m->name,m->value);
     297  return res;
     298}
     299
     300char *parseJVMXOption(map* m){
     301  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
     302  sprintf(res,"-X%s:%s",m->name,m->value);
     303  return res;
     304}
     305
    266306jobject HashMap_FromMaps(JNIEnv *env,maps* t,jclass scHashMapClass,jclass scHashMap_class,jmethodID scHashMap_constructor){
    267307  jobject scObject,scObject1;

  • trunk/zoo-project/zoo-kernel/service_internal_java.h

    r388 r539  
    4141  void displayStack(JNIEnv*,maps*);
    4242
     43  char *parseJVMXXOption(map*);
     44
     45  char *parseJVMXOption(map*);
     46
    4347  int zoo_java_support(maps**,map*,service*,maps**,maps**);
    4448

  • trunk/zoo-project/zoo-kernel/service_internal_python.c

    r508 r539  
    212212    else{
    213213      pName = PyString_FromString(tmp->value);
    214       fprintf(stderr,"%s %d",tmp->value,__LINE__);
    215214    }
    216215  }

  • trunk/zoo-project/zoo-kernel/ulinet.c

    r534 r539  
    299299    char *tmp;
    300300    curl_easy_getinfo(hInternet->ihandle[i].handle,CURLINFO_CONTENT_TYPE,&tmp);
    301     hInternet->ihandle[i].mimeType=strdup(tmp);
     301    if(tmp!=NULL)
     302      hInternet->ihandle[i].mimeType=strdup(tmp);
    302303    curl_multi_remove_handle(hInternet->handle, hInternet->ihandle[i].handle);
    303304    curl_easy_cleanup(hInternet->ihandle[i].handle);

  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r527 r539  
    256256        fprintf(stderr,"#################\n%s\n#################\n",tmps1);
    257257#endif
    258         t=readServiceFile(m,tmps1,&s1,dp->d_name);
    259 
     258        char *tmpsn=zStrdup(dp->d_name);
     259        tmpsn[strlen(tmpsn)-5]=0;
     260        t=readServiceFile(m,tmps1,&s1,tmpsn);
     261        free(tmpsn);
    260262        if(t<0){
    261263          map* tmp00=getMapFromMaps(m,"lenv","message");
    … …  
    994996            if(tmpMap!=NULL)
    995997              addToMap(request_inputs,"metapath",tmpMap->value);
     998            map* tmpMapI=getMapFromMaps(m,"lenv","Identifier");
    996999
    9971000            s1=(service*)malloc(SERVICE_SIZE);
    998             t=readServiceFile(m,buff1,&s1,corig);
     1001            t=readServiceFile(m,buff1,&s1,tmpMapI->value);
    9991002            if(t<0){
    10001003              map* tmp00=getMapFromMaps(m,"lenv","message");
    … …  
    11651168      addToMap(request_inputs,"metapath",tmpMap->value);
    11661169    free(identifier);
    1167   }else
     1170  }else{
    11681171    setMapInMaps(m,"lenv","Identifier",r_inputs->value);
     1172    setMapInMaps(m,"lenv","oIdentifier",r_inputs->value);
     1173  }
     1174
     1175  r_inputs=getMapFromMaps(m,"lenv","Identifier");
    11691176  int saved_stdout = dup(fileno(stdout));
    11701177  dup2(fileno(stderr),fileno(stdout));
Note: See TracChangeset for help on using the changeset viewer.

Download now !

Search

Context Navigation

Main Navigation

ZOO Sponsors

http://www.zoo-project.org/trac/chrome/site/img/geolabs-logo.pnghttp://www.zoo-project.org/trac/chrome/site/img/neogeo-logo.png http://www.zoo-project.org/trac/chrome/site/img/apptech-logo.png http://www.zoo-project.org/trac/chrome/site/img/3liz-logo.png http://www.zoo-project.org/trac/chrome/site/img/gateway-logo.png

Become a sponsor !

Knowledge partners

http://www.zoo-project.org/trac/chrome/site/img/ocu-logo.png http://www.zoo-project.org/trac/chrome/site/img/gucas-logo.png http://www.zoo-project.org/trac/chrome/site/img/polimi-logo.png http://www.zoo-project.org/trac/chrome/site/img/fem-logo.png http://www.zoo-project.org/trac/chrome/site/img/supsi-logo.png http://www.zoo-project.org/trac/chrome/site/img/cumtb-logo.png

Become a knowledge partner

Related links

http://zoo-project.org/img/ogclogo.png http://zoo-project.org/img/osgeologo.png