Changeset 743


Ignore:
Timestamp:
Dec 3, 2015, 8:44:39 AM (6 years ago)
Author:
djay
Message:

Add WCPS-Proxy, data-api proxy and update Makefile for dealing with specific location of fastcgi. Add status update for contour lines computation.

Location:
trunk/zoo-project/zoo-services
Files:
13 added
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-services/cgal/Makefile

    r650 r743  
    11ZRPATH=../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
     
    77        g++ ${CFLAGS} -c ./delaunay.c
    88        g++ ${CFLAGS} -c ./voronoi.c
    9         g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp -lgdal -lzoo_service
     9        g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${MACOS_LD_FLAGS} ${CGAL_LDFLAGS} -lCGAL -lgmp ${GDAL_LIBS} -L${INST_LIB}
    1010
    1111cgal_service.o: cgal_service.c cgal_service.h
  • trunk/zoo-project/zoo-services/gdal/contour/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-DZOO_SERVICE -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/contour_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/contour_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service ${FCGI_LDFLAGS}
    88install:
    99        install -d ${CGI_DIR}/gdal/contour
  • trunk/zoo-project/zoo-services/gdal/contour/service.c

    r450 r743  
    3636#ifdef ZOO_SERVICE
    3737#include "service.h"
     38#include "service_internal.h"
    3839#endif
    3940CPL_CVSID("$Id: gdal_contour.cpp 25643 2013-02-12 13:50:42Z bishop $");
     
    7374    exit( 1 );
    7475}
     76
     77#ifdef ZOO_SERVICE
     78  int pfnProgress1( double dfComplete, const char *pszMessage, void *pData)
     79  {
     80    maps* conf=(maps*)pData;
     81    map* tmpMap=getMapFromMaps(conf,"lenv","status");
     82    char tmpStr[4];
     83    sprintf(tmpStr,"%d",(int) (dfComplete*100));
     84    if(tmpMap!=NULL && strcmp(tmpMap->value,tmpStr)!=0){
     85      if( pszMessage != NULL && strlen(pszMessage)>1){
     86        updateStatus(conf,(int) (dfComplete*100), pszMessage);
     87      }     
     88      else
     89        updateStatus(conf,(int) (dfComplete*100), "Processing...");
     90    }
     91    return TRUE;
     92  }
     93#endif
    7594
    7695/************************************************************************/
     
    106125    const char *pszNewLayerName = "contour";
    107126    int bQuiet = FALSE;
    108     GDALProgressFunc pfnProgress = NULL;
    109     fprintf(stderr,"DEBUG HELLO %f %d\n",__FILE__,__LINE__);
    110     fflush(stderr);
    111127#ifndef ZOO_SERVICE
    112128    /* Check that we are running against at least GDAL 1.4 */
     
    262278    }
    263279   
    264     if (!bQuiet)
    265         pfnProgress = GDALTermProgress;
    266 
     280    /*if (!bQuiet)
     281      pfnProgress = GDALTermProgress;*/
     282    //pfnProgress = GDALTermProgress;
    267283/* -------------------------------------------------------------------- */
    268284/*      Open source raster file.                                        */
     
    372388                                 OGR_FD_GetFieldIndex( OGR_L_GetLayerDefn( hLayer ),
    373389                                                       pszElevAttrib ),
    374                          pfnProgress, NULL );
     390                         pfnProgress1, conf );
    375391
    376392    OGR_DS_Destroy( hDS );
  • trunk/zoo-project/zoo-services/gdal/dem/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-DZOO_SERVICE -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/dem_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/dem_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/dem_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/gdal/grid/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/service.zo: service.c
    7         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/gdal_grid_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/gdal/profile/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/profile_service.zo: service.c
    7         g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/profile_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/gdal/translate/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/translate_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/translate_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/translate_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/gdal/warp/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/warp_service.zo: service.c
    7         g++ ${CFLAGS} -shared -fpic -o cgi-env/warp_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -lzoo_service
     7        g++ ${CFLAGS} -shared -fpic -o cgi-env/warp_service.zo ./service.c ${GDAL_LIBS} ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/hello-py/cgi-env/test_service.py

    r447 r743  
    3030        return zoo.SERVICE_SUCCEEDED
    3131
     32def geopaposm(conf,inputs,outputs):
     33        outputs["result"]["value"]=inputs["inputvector"]["value"]
     34        return zoo.SERVICE_SUCCEEDED
     35   
     36def publish(conf,inputs,outputs):
     37    outputs["Result"]["value"]=inputs["in"]["value"]
     38    return zoo.SERVICE_SUCCEEDED
  • trunk/zoo-project/zoo-services/ogr/ogr2ogr/Makefile

    r650 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-DZOO_SERVICE -I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/ogr2ogr_service.zo: service.c $(DEP_LIBS)
    7         g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@ ${GDAL_LIBS} -lzoo_service
     7        g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@ ${GDAL_LIBS} -L${INST_LIB} -lzoo_service
    88
    99install:
  • trunk/zoo-project/zoo-services/qrencode/Makefile

    r471 r743  
    11ZRPATH=../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44CC=gcc
    55
    66cgi-env/qrencode.zo: qrenc-service.c
    7         g++ -DZOO_SERVICE_PROVIDER ${CFLAGS} -shared -fpic -o cgi-env/qrencode.zo ./qrenc-service.c -lqrencode ${GDAL_LIBS} -lpng ${MACOS_LD_FLAGS}
     7        g++ -DZOO_SERVICE_PROVIDER ${CFLAGS} -shared -fpic -o cgi-env/qrencode.zo ./qrenc-service.c -lqrencode ${GDAL_LIBS} -lpng ${MACOS_LD_FLAGS} -L${INST_LIB} -lzoo_service
    88
    99clean:
  • trunk/zoo-project/zoo-services/qrencode/qrenc-service.c

    r385 r743  
    2525# include "config.h"
    2626#endif
     27#include "string.h"
    2728#include <stdio.h>
    2829#include <stdlib.h>
    2930#include <png.h>
    3031#include <getopt.h>
     32#include "qrencode.h"
    3133
    3234#ifdef ZOO_SERVICE_PROVIDER
     
    4143#endif
    4244
    43 #include "qrencode.h"
    4445
    4546#define INCHES_PER_METER (100.0/2.54)
  • trunk/zoo-project/zoo-services/utils/status/Makefile

    r643 r743  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44
    55cgi-env/wps_status.zo: service.c
    6         g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} -lfcgi -lzoo_service
     6        g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_status.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} ${FCGI_LDFLAGS} -L${INST_LIB} -lzoo_service
    77
    88install:
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