Ignore:
Timestamp:
Apr 23, 2014, 4:21:28 AM (6 years ago)
Author:
djay
Message:

Fix issue with language gesture on Ubuntu platforms.

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

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/Makefile.in

    r465 r466  
    1212JAVA_FILE=@JAVA_FILE@
    1313
    14 CFLAGS=-fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
     14CFLAGS=@DEB_DEF@ -fpic ${YAML_CFLAGS} ${MACOS_CFLAGS} ${MS_CFLAGS} -I../../thirds/cgic206 -I. -DLINUX_FREE_ISSUE #-DDEBUG #-DDEBUG_SERVICE_CONF
    1515LDFLAGS=-lcurl -L../../thirds/cgic206 -lcgic ${GDAL_LIBS} ${XML2LDFLAGS} ${PYTHONLDFLAGS} ${PERLLDFLAGS}  ${PHPLDFLAGS} ${JAVALDFLAGS} ${JSLDFLAGS} -lfcgi -lcrypto ${MS_LDFLAGS} ${MACOS_LD_FLAGS} ${YAML_LDFLAGS}
    1616
     
    3030
    3131version.h:
    32         echo "#define ZOO_VERSION \"`svnversion -q -c -n .`\"" > version.h
     32        echo "#define ZOO_VERSION \"`svnversion`\"" > version.h
    3333
    3434main_conf_read.tab.c: main_conf_read.y service.h
  • trunk/zoo-project/zoo-kernel/configure.ac

    r465 r466  
    3636AC_FUNC_REALLOC
    3737AC_CHECK_FUNCS([dup2 getcwd memset setenv strdup strstr])
     38
     39#============================================================================
     40# Detect if run on debian / ubuntu
     41#============================================================================
     42if test -f "/usr/bin/dpkg"
     43then
     44        DEB_DEF=-DDEB
     45fi
     46AC_SUBST([DEB_DEF])
    3847
    3948#============================================================================
  • trunk/zoo-project/zoo-kernel/service.h

    r465 r466  
    733733  static void dumpElementsAsYAML(elements* e){
    734734    elements* tmp=e;
    735     while(tmp!=NULL){
    736       for(int i=0;i<2;i++)
     735    int i;
     736    while(tmp!=NULL){
     737      for(i=0;i<2;i++)
    737738        fprintf(stderr," ");
    738739      fprintf(stderr,"%s:\n",tmp->name);
    739740      map* mcurs=tmp->content;
    740741      while(mcurs!=NULL){
    741         for(int i=0;i<4;i++)
     742        for(i=0;i<4;i++)
    742743          fprintf(stderr," ");
    743744        _dumpMap(mcurs);
     
    746747      mcurs=tmp->metadata;
    747748      if(mcurs!=NULL){
    748         for(int i=0;i<4;i++)
     749        for(i=0;i<4;i++)
    749750          fprintf(stderr," ");
    750751        fprintf(stderr,"MetaData:\n");
    751752        while(mcurs!=NULL){
    752           for(int i=0;i<6;i++)
     753          for(i=0;i<6;i++)
    753754            fprintf(stderr," ");
    754755          _dumpMap(mcurs);
     
    756757        }
    757758      }
    758       for(int i=0;i<4;i++)
     759      for(i=0;i<4;i++)
    759760        fprintf(stderr," ");
    760761      fprintf(stderr,"%s:\n",tmp->format);
     
    762763      int ioc=0;
    763764      while(tmpio!=NULL){
    764         for(int i=0;i<6;i++)
     765        for(i=0;i<6;i++)
    765766          fprintf(stderr," ");
    766767        fprintf(stderr,"default:\n");
    767768        mcurs=tmpio->content;
    768769        while(mcurs!=NULL){
    769           for(int i=0;i<8;i++)
     770          for(i=0;i<8;i++)
    770771            fprintf(stderr," ");
    771772          if(strcasecmp(mcurs->name,"range")==0){
     
    781782      ioc=0;
    782783      while(tmpio!=NULL){
    783         for(int i=0;i<6;i++)
     784        for(i=0;i<6;i++)
    784785          fprintf(stderr," ");
    785786        fprintf(stderr,"supported:\n");
    786787        mcurs=tmpio->content;
    787788        while(mcurs!=NULL){
    788           for(int i=0;i<8;i++)
     789          for(i=0;i<8;i++)
    789790            fprintf(stderr," ");
    790791          if(strcasecmp(mcurs->name,"range")==0){
     
    881882  static void dumpServiceAsYAML(service* s){
    882883    int level=0;
     884    int i;
    883885    fprintf(stderr,"# %s\n\n",s->name);
    884886    if(s->content!=NULL){
     
    889891        fprintf(stderr,"MetaData:\n");
    890892        while(mcurs!=NULL){
    891           for(int i=0;i<2;i++)
     893          for(i=0;i<2;i++)
    892894            fprintf(stderr," ");
    893895          _dumpMap(mcurs);
     
    997999          else{
    9981000            if(hasLength!=NULL){
    999               for(int j=0;j<atoi(hasLength->value);j++){
     1001              int j;
     1002              for(j=0;j<atoi(hasLength->value);j++){
    10001003                map* tmp0=getMapArray(curs->content,"value",j);
    10011004                if(j==0)
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r465 r466  
    606606    char *tmp=zStrdup(r_inputs->value);
    607607    setMapInMaps(m,"main","language",tmp);
     608#ifdef DEB
     609    char tmp2[12];
     610    sprintf(tmp2,"%s.utf-8",tmp);
     611    translateChar(tmp2,'-','_');
     612    setlocale (LC_ALL, tmp2);
     613#else
    608614    translateChar(tmp,'-','_');
    609615    setlocale (LC_ALL, tmp);
     616#endif
    610617#ifndef WIN32
    611618    setenv("LC_ALL",tmp,1);
Note: See TracChangeset for help on using the changeset viewer.

Search

Context 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