Ignore:
Timestamp:
Aug 5, 2011, 3:02:43 PM (13 years ago)
Author:
djay
Message:

Merge branch-1.2 r268:r296.

Location:
branches/branch-1.2
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/branch-1.2

  • branches/branch-1.2/zoo-services/cgal/Makefile

    r217 r301  
    1 CFLAGS=-I../../zoo-kernel/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/cgal_service.zo: service.c
    5         g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c -lgdal -lCGAL
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/cgal_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lCGAL
    68
    79clean:
    8         rm -f cgi-env/*.zo *.o *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling
    9         rm -rf service_loader.dSYM
     10        rm -f cgi-env/*.zo

  • branches/branch-1.2/zoo-services/gdal/grid/Makefile

    r1 r301  
    1 CFLAGS=-I../../../zoo-kernel-svn/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/service.zo: service.c
    5         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c -lgdal
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:

  • branches/branch-1.2/zoo-services/gdal/grid/service.c

    r1 r301  
    879879      char *ext=new char[4];
    880880      ext="tif";
    881       if(strcmp(mtoupper((char*)pszFormat),"AAIGRID")==0)
     881      if(strncasecmp(pszFormat,"AAIGRID",7)==0)
    882882        ext="csv";
    883883      else
    884         if(strcmp(mtoupper((char*)pszFormat),"PNG")==0)
     884        if(strncasecmp(pszFormat,"PNG",3)==0)
    885885          ext="png";
    886886        else
    887           if(strcmp(mtoupper((char*)pszFormat),"GIF")==0)
     887          if(strncasecmp(pszFormat,"GIF",3)==0)
    888888            ext="gif";
    889889          else
    890             if(strcmp(mtoupper((char*)pszFormat),"JPEG")==0)
     890            if(strncasecmp(pszFormat,"JPEG",4)==0)
    891891              ext="jpg";
    892892      sprintf((char*)pszDest,"%s/%s.%s",tempPath,tmpMap->value,ext);

  • branches/branch-1.2/zoo-services/gdal/profile/Makefile

    r50 r301  
    1 CFLAGS=-I../../../zoo-kernel/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/gdal_profile_service.zo: service.c
    5         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_profile_service.zo ./service.c -lgdal
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:

  • branches/branch-1.2/zoo-services/gdal/translate/Makefile

    r1 r301  
    1 CFLAGS=-I../../../zoo-kernel-svn/ -I./ `xml2-config --cflags` `python-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    24CC=gcc
    35
    46cgi-env/service.zo: service.c
    5         g++ ${CFLAGS} -shared -fpic -o cgi-env/service.zo ./service.c -lgdal
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS}
    68
    79clean:
    8         rm -f *.zo *.o *.tab.c *.tab.h *.sr.c* service_loader lex.* *.lreg *.sibling
    9         rm -rf service_loader.dSYM
     10        rm -f cgi-env/*.zo

  • branches/branch-1.2/zoo-services/gdal/translate/cgi-env/Gdal_Translate.zcfg

    r106 r301  
    88 serviceProvider = gdal_service.zo
    99 <MetaData>
    10    Test = My Demo
     10   title = My Demo
    1111 </MetaData>
    1212 <DataInputs>
    … …  
    1919    DataType = string
    2020    <Default>
    21      value = AAIGrid
     21     value = demo.tif
    2222    </Default>
    2323   </LiteralData>

  • branches/branch-1.2/zoo-services/gdal/translate/service.c

    r1 r301  
    133133      char *ext=new char[4];
    134134      ext="tif";
    135       if(strcmp(mtoupper((char*)pszFormat),"AAIGRID")==0)
     135      if(strncasecmp(pszFormat,"AAIGRID",7)==0)
    136136        ext="csv";
    137137      else
    138         if(strcmp(mtoupper((char*)pszFormat),"PNG")==0)
     138        if(strncasecmp(pszFormat,"PNG",3)==0)
    139139          ext="png";
    140140        else
    141           if(strcmp(mtoupper((char*)pszFormat),"GIF")==0)
     141          if(strncasecmp(pszFormat,"GIF",3)==0)
    142142            ext="gif";
    143143          else
    144             if(strcmp(mtoupper((char*)pszFormat),"JPEG")==0)
     144            if(strncasecmp(pszFormat,"JPEG",4)==0)
    145145              ext="jpg";
    146146      sprintf((char*)pszDest,"%s/%s.%s",tempPath,tmpMap->value,ext);

  • branches/branch-1.2/zoo-services/ogr/base-vect-ops/Makefile

    r106 r301  
    1 CFLAGS=-I../../../zoo-kernel/ -I./ `geos-config --cflags` `xml2-config --cflags`  `gdal-config --cflags`  -DLINUX_FREE_ISSUE #-DDEBUG
    2 # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have
    3 # uncomment the following line
    4 # JS_LDFLAGS=../../../zoo-kernel/ulinet.o ../../../zoo-kernel/service_internal_js.o
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${JSCFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} `geos-config --cflags` -DLINUX_FREE_ISSUE #-DDEBUG
    54
    65cgi-env/ogr_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} `xml2-config --libs` `gdal-config --libs` `geos-config --libs`
     6        g++ ${CFLAGS} -shared -fpic -o cgi-env/ogr_service.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `geos-config --libs`
    87
    98clean:

  • branches/branch-1.2/zoo-services/ogr/base-vect-ops/service.c

    r217 r301  
    4444  void printExceptionReportResponse(maps*,map*);
    4545  char *base64(const char *input, int length);
     46  int errorException(maps *m, const char *message, const char *errorcode);
    4647
    4748  OGRGeometryH createGeometryFromGML(maps* conf,char* inputStr){

  • branches/branch-1.2/zoo-services/utils/status/Makefile

    r268 r301  
    1 CFLAGS=-I../../../thirds/cgic206/ -I../../../zoo-kernel/ -I./ `xslt-config --cflags` `xml2-config --cflags` -lintl -lfcgi -lcrypto -DLINUX_FREE_ISSUE #-DDEBUG
    2 # if JS_ENABLED flag is set to true in your ZOO-Kernel Makefile then you'll have
    3 # uncomment the following line
    4 # JS_LDFLAGS=../../../zoo-kernel/ulinet.o ../../../zoo-kernel/service_internal_js.o
     1ZRPATH=../../..
     2include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
     3CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    54
    65cgi-env/wps_status.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} `xml2-config --libs` `xslt-config --libs`
     6        g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ../../../zoo-kernel/service_internal.o ${JS_LDFLAGS} ${JSLDFLAGS} ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} `xslt-config --libs` -lfcgi
    87
    98clean:
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