Ignore:
Timestamp:
May 7, 2019, 2:17:08 PM (5 years ago)
Author:
djay
Message:

Merge prototype-v0 branch in trunk

Location:
trunk
Files:
17 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/zoo-project/zoo-services/cgal/Makefile

    r779 r917  
    11ZRPATH=../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} ${CGAL_CFLAGS} -frounding-math -fPIC -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS= ${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 ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
     9        g++ ${CFLAGS} -shared -o cgi-env/cgal_service.zo ./delaunay.o ./voronoi.o ./cgal_service.o ${GDAL_LIBS} ${CGAL_LDFLAGS} -lCGAL -lgmp ${GDAL_LIBS} -L${ZRPATH}/zoo-kernel/ -lzoo_service -lfcgi
    1010
    1111cgal_service.o: cgal_service.c cgal_service.h

  • trunk/zoo-project/zoo-services/cgal/cgal_service.c

    r775 r917  
    2424#include "cgal_service.h"
    2525
    26 int parseInput(maps* conf,maps* inputs, std::vector<Point>* points,char* filename){
     26int parseInput(maps* conf,maps* inputs, std::vector<Pointz>* points,char* filename){
    2727  map* tmpm=NULL;
    28   tmpm=getMapFromMaps(inputs,"InputPoints","value");
    29   VSILFILE *ifile=VSIFileFromMemBuffer(filename,(GByte*)tmpm->value,strlen(tmpm->value),FALSE);
    30   VSIFCloseL(ifile);
     28  tmpm=getMapFromMaps(inputs,"InputPoints","cache_file");
    3129#if GDAL_VERSION_MAJOR >= 2
    32   GDALDataset *ipoDS =
    33     (GDALDataset*) GDALOpenEx( filename,
    34                                GDAL_OF_READONLY | GDAL_OF_VECTOR,
    35                                NULL, NULL, NULL );
     30  GDALDataset *ipoDS;
    3631#else
    37   OGRDataSource* ipoDS = OGRSFDriverRegistrar::Open(filename,FALSE);
     32  OGRDataSource* ipoDS;
    3833#endif
     34  if(tmpm==NULL){
     35    tmpm=getMapFromMaps(inputs,"InputPoints","value");
     36    VSILFILE *ifile=VSIFileFromMemBuffer(filename,(GByte*)tmpm->value,strlen(tmpm->value),FALSE);
     37    VSIFCloseL(ifile);
     38#if GDAL_VERSION_MAJOR >= 2
     39  ipoDS = (GDALDataset*) GDALOpenEx( filename,
     40                                     GDAL_OF_READONLY | GDAL_OF_VECTOR,
     41                                     NULL, NULL, NULL );
     42#else
     43  ipoDS = OGRSFDriverRegistrar::Open(filename,FALSE);
     44#endif
     45  }else
     46#if GDAL_VERSION_MAJOR >= 2
     47    ipoDS = (GDALDataset*) GDALOpenEx( tmpm->value,
     48                                       GDAL_OF_READONLY | GDAL_OF_VECTOR,
     49                                       NULL, NULL, NULL );
     50#else
     51    ipoDS = OGRSFDriverRegistrar::Open(tmpm->value,FALSE);
     52#endif
     53   
    3954  if( ipoDS == NULL )
    4055    {
    … …  
    87102          break;
    88103        if(poFeature->GetGeometryRef() != NULL){
    89           points->push_back(Point(OGR_G_GetX(poFeature->GetGeometryRef(),0),OGR_G_GetY(poFeature->GetGeometryRef(),0)));
     104          points->push_back(Pointz(OGR_G_GetX(poFeature->GetGeometryRef(),0),OGR_G_GetY(poFeature->GetGeometryRef(),0)));
    90105        }
    91106      }

  • trunk/zoo-project/zoo-services/cgal/cgal_service.h

    r469 r917  
    3838
    3939typedef CGAL::Exact_predicates_inexact_constructions_kernel            Kernel;
    40 typedef Kernel::Point_2                                                Point;
     40typedef Kernel::Point_2                                                Pointz;
    4141
    42 int parseInput(maps*,maps*, std::vector<Point>*,char*);
     42int parseInput(maps*,maps*, std::vector<Pointz>*,char*);
    4343
    4444#endif

  • trunk/zoo-project/zoo-services/cgal/cgi-env/Voronoi.zcfg

    r536 r917  
    4646    </Default>
    4747    <Supported>
     48      mimeType = image/png
     49      useMapserver = true
     50      asReference = true
     51      msStyle = STYLE COLOR 125 0 105 OUTLINECOLOR 0 0 0 WIDTH 0.3 OPACITY 65 END
     52    </Supported>
     53    <Supported>
    4854     mimeType = text/xml
    4955     encoding = base64

  • trunk/zoo-project/zoo-services/cgal/delaunay.c

    r775 r917  
    4040    OGRRegisterAll();
    4141
    42     std::vector<Point> points;
     42    std::vector<Pointz> points;
    4343    if(int res=parseInput(conf,inputs,&points,"/vsimem/tmp")!=SERVICE_SUCCEEDED)
    4444      return res;

  • trunk/zoo-project/zoo-services/cgal/voronoi.c

    r775 r917  
    2424
    2525#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
    26 #include <CGAL/Triangulation_euclidean_traits_xy_3.h>
     26//#include <CGAL/Triangulation_euclidean_traits_2.h>
    2727#include <CGAL/Delaunay_triangulation_2.h>
    28 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
     28//#include <CGAL/Constrained_Delaunay_triangulation_2.h>
    2929#include <CGAL/Triangulation_conformer_2.h>
    3030#include <CGAL/Triangulation_face_base_2.h>
    … …  
    3939
    4040typedef CGAL::Delaunay_triangulation_2<Kernel>  Triangulation;
     41typedef Triangulation::Face_iterator  Face_iterator;
    4142typedef Triangulation::Edge_iterator  Edge_iterator;
    4243typedef Triangulation::Vertex_circulator Vertex_circulator;
    … …  
    4546
    4647  int Voronoi(maps*& conf,maps*& inputs,maps*& outputs){
    47 #ifdef DEBUG
     48    //#ifdef DEBUG
    4849    fprintf(stderr,"\nService internal print\nStarting\n");
    49 #endif
     50    //#endif
     51    //return SERVICE_FAILED;
    5052    maps* cursor=inputs;
    5153    OGRGeometryH geometry,res;
    … …  
    5456    tmpm=getMapFromMaps(inputs,"InputPoints","value");
    5557
     58    fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
     59    fflush(stderr);
     60
    5661    OGRRegisterAll();
    5762
    58     std::vector<Point> points;
    59     if(int res=parseInput(conf,inputs,&points,"/vsimem/tmp")!=SERVICE_SUCCEEDED)
    60       return res;
     63    std::vector<Pointz> points;
     64    if(int res=parseInput(conf,inputs,&points,"/vsimem/tmp")!=SERVICE_SUCCEEDED){
     65      fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
     66      fflush(stderr);
     67      return SERVICE_FAILED;
     68    }
     69    fprintf(stderr," **** %s %d\n",__FILE__,__LINE__);
     70    fflush(stderr);
    6171   
    6272    Triangulation T;
    6373    T.insert(points.begin(), points.end());
    6474
    65     OGRRegisterAll();
     75    //OGRRegisterAll();
    6676    /* -------------------------------------------------------------------- */
    6777    /*      Try opening the output datasource as an existing, writable      */
    … …  
    187197    int ns = 0;
    188198    int nr = 0;
     199    int nf = 0;
     200    Face_iterator fit =T.faces_begin();
     201    FILE* f=fopen("/tmp/toto.log","w+");
     202    for ( ; fit !=T.faces_end(); ++fit) {
     203      fprintf(stderr," *** %s %d %d %d\n",__FILE__,__LINE__,nf,fit.info());
     204      fflush(stderr);
     205     
     206      nf++;
     207    }
     208    fclose(f);
    189209    Edge_iterator eit =T.edges_begin();
    190210    for ( ; eit !=T.edges_end(); ++eit) {
    191211      CGAL::Object o = T.dual(eit);
    192212      if (const Kernel::Segment_2 *tmp=CGAL::object_cast<Kernel::Segment_2>(&o)) {
    193         const Point p1=tmp->source();
    194         const Point p2=tmp->target();
     213        const Pointz p1=tmp->source();
     214        const Pointz p2=tmp->target();
     215        fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());
    195216#ifdef DEBUG
    196217        fprintf(stderr,"P1 %d %d | P2 %d %d\n",p1.x(),p1.y(),p2.x(),p2.y());
    … …  
    210231      }
    211232      else if (const Kernel::Ray_2 *tmp=CGAL::object_cast<Kernel::Ray_2>(&o)) {
    212         const Point p1=tmp->source();
    213         const Point p2=tmp->point(2);
     233        const Pointz p1=tmp->source();
     234        const Pointz p2=tmp->point(2);
    214235        OGRFeatureH hFeature = OGR_F_Create( OGR_L_GetLayerDefn( poDstLayer ) );
    215236        OGRGeometryH currLine=OGR_G_CreateGeometry(wkbLineString);
    … …  
    250271    fprintf(stderr,"\nService internal print\n===\n");
    251272#endif
    252     OGRCleanupAll();
     273    //OGRCleanupAll();
    253274    return SERVICE_SUCCEEDED;
    254275  }

  • trunk/zoo-project/zoo-services/gdal/dem/cgi-env/Gdal_Dem.zcfg

    r412 r917  
    4444    <Default />
    4545   </LiteralData>
     46  [co]
     47   Title = Creation Option
     48   Abstract = string representing options (NAME=VALUE)
     49   minOccurs = 0
     50   maxOccurs = 1
     51   <LiteralData>
     52    DataType = string
     53    <Default />
     54   </LiteralData>
    4655 </DataInputs>
    4756 <DataOutputs>

  • trunk/zoo-project/zoo-services/gdal/dem/service.c

    r444 r917  
    24862486      setMapInMaps(outputs,"Result","value",tmpMap->value);
    24872487    }
     2488   
     2489    tmpMap=getMapFromMaps(inputs,"co","value");
     2490    if(tmpMap!=NULL){
     2491      papszCreateOptions = CSLAddString( papszCreateOptions, tmpMap->value ); 
     2492      map* tmpMap1;
     2493      maps* tmpMaps=getMaps(inputs,"co");
     2494      if((tmpMap1=getMapFromMaps(inputs,"co","length"))!=NULL){
     2495        int i=1;
     2496        int length=atoi(tmpMap1->value);
     2497        for(;i<length;i++){
     2498          tmpMap=getMapArray(tmpMaps->content,"value",i);
     2499          papszCreateOptions = CSLAddString( papszCreateOptions, tmpMap->value );
     2500        }
     2501      }
     2502    }   
    24882503
    24892504    tmpMap=NULL;

  • trunk/zoo-project/zoo-services/hello-mono/cgi-env/longProcessMono.zcfg

    r794 r917  
    11[longProcessMono]
    2  Title = Create a welcome message string.
    3  Abstract = Create a welcome string.
     2 Title = Demo long process.
     3 Abstract = This service doesn't do anything except taking its time, it demonstrates how to use the updateStatus function from your ZOO Service.
    44 processVersion = 2
    55 storeSupported = true
    … …  
    1313   Title = Input string
    1414   Abstract = The name to display in the welcome message.
    15    minOccurs = 1
     15   minOccurs = 0
    1616   maxOccurs = 1
    1717   <LiteralData>
    1818    dataType = int
    19     <Default>
    20     AllowedValues = 101,202,303,404
    21     rangeMin = -100
    22     rangeMax = 100
    23     rangeSpacing = 1
    24     rangeClosure = co
    25       value = 11
    26     </Default>
    27     <Supported>
    28         AllowedValues = 405,502,503,504
    29     </Supported>
    30     <Supported>
    31         AllowedValues = 540,502,603,604
    32     </Supported>
     19    <Default />
    3320   </LiteralData>
    3421 </DataInputs>

  • trunk/zoo-project/zoo-services/ogr/base-vect-ops-py/cgi-env/ogr_sp.py

    r465 r917  
    9595
    9696def extractInputs(conf,obj):
     97    if obj.keys().count("cache_file"):
     98        print >> sys.stderr,obj
     99        geometry=[]
     100        ds = osgeo.ogr.Open(obj["cache_file"])
     101        lyr = ds.GetLayer(0)
     102        feat = lyr.GetNextFeature()
     103        while feat is not None:
     104            geometry+=[feat.Clone()]
     105            feat.Destroy()
     106            feat = lyr.GetNextFeature()
     107        ds.Destroy()
     108        return geometry   
    97109    if obj["mimeType"]=="application/json":
    98110        return createLayerFromJson(conf,obj["value"])

  • trunk/zoo-project/zoo-services/ogr/base-vect-ops/service.c

    r769 r917  
    473473          {
    474474
    475             if( EQUAL(
     475            if(
    476476#if GDAL_VERSION_MAJOR >=2
    477                       poR->GetDriver(iDriver)->GetDescription()
    478 #else
    479                       poR->GetDriver(iDriver)->GetName()
    480 #endif
    481                       ,oDriver1) )
     477                EQUAL(poR->GetDriver(iDriver)->GetDescription(),oDriver1)
     478#else
     479                EQUAL(poR->GetDriver(iDriver)->GetName(),oDriver1)
     480#endif
     481                )
    482482              {
    483483                poDriver = poR->GetDriver(iDriver);

  • trunk/zoo-project/zoo-services/ogr/ogr2ogr/service.c

    r790 r917  
    9696#endif
    9797{
     98    char  *pszDialect = NULL;
    9899    const char  *pszFormat = "ESRI Shapefile";
    99100    const char  *pszDataSource = NULL;
    … …  
    155156      sprintf(serverAddress,"%s",tmpMap->value);
    156157    }
    157    
     158
    158159    tmpMap=NULL;
    159160    char tmpurl[1024];
    … …  
    223224    if(tmpMap!=NULL && strncasecmp(tmpMap->value,"NULL",4)!=0){
    224225      pszSQLStatement = tmpMap->value;
     226    }
     227
     228    tmpMap=getMapFromMaps(inputs,"dialect","value");
     229    if(tmpMap!=NULL){
     230      pszDialect=strdup(tmpMap->value);
    225231    }
    226232
    … …  
    360366          dfMaxSegmentLength = atof(tmpMap->value);
    361367    }
    362 
    363     /*tmpMap=NULL;
    364     tmpMap=getMapFromMaps(inputs,"segmentize","value");
    365     if(tmpMap!=NULL){
    366           dfMaxSegmentLength = atof(tmpMap->value);
    367     }*/
    368 
     368   
    369369    tmpMap=NULL;
    370370    tmpMap=getMapFromMaps(inputs,"InputDSN","value");
    … …  
    825825       
    826826        poResultSet = poDS->ExecuteSQL( pszSQLStatement, poSpatialFilter,
    827                                         NULL );
     827                                        pszDialect );
    828828
    829829        if( poResultSet != NULL )
    … …  
    841841            }
    842842            poDS->ReleaseResultSet( poResultSet );
    843         }
    844     }
     843        }else{
     844          setMapInMaps(conf,"lenv","message","There was an error when running yoru SQL query.");
     845          if(pszDialect!=NULL)
     846            free(pszDialect);
     847          return SERVICE_FAILED;
     848        }
     849    }
     850    if(pszDialect!=NULL)
     851      free(pszDialect);
    845852
    846853/* -------------------------------------------------------------------- */
    … …  
    901908
    902909#ifdef ZOO_SERVICE
    903     outputs->content=createMap("value",(char*)pszwebDestData);
     910    setMapInMaps(outputs,"OutputedDataSourceName","value",(char*)pszwebDestData);
     911    //outputs->content=createMap("value",(char*)pszwebDestData);
    904912#endif
    905913
    … …  
    930938    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    931939
    932     OGRCleanupAll();
     940    //OGRCleanupAll();
    933941    fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    934942
    … …  
    939947   
    940948#ifdef ZOO_SERVICE
     949    //sleep(10);
    941950    return SERVICE_SUCCEEDED;
    942951#else

  • trunk/zoo-project/zoo-services/utils/registry/Makefile

    r779 r917  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3ZCFLAGS=-I${ZRPATH}/zoo-kernel/ ${CFLAGS} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
    44
    55YAML_FILES=""
    … …  
    1616
    1717cgi-env/wps_registry.zo: service.c
    18         g++ ${CFLAGS} -shared -fpic -o cgi-env/wps_registry.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} -lfcgi -L${ZRPATH}/zoo-kernel/ -lzoo_service ${ZRPATH}/zoo-kernel/server_internal.o ${ZRPATH}/zoo-kernel/lex.cr.o ${ZRPATH}/zoo-kernel/lex.sr.o ${ZRPATH}/zoo-kernel/service_conf.tab.o ${ZRPATH}/zoo-kernel/main_conf_read.tab.o ${ZRPATH}/zoo-kernel/response_print.o ${YAML_FILES} ${MS_FILES} ${MS_LDFLAGS} ${YAML_LDFLAGS}
     18        g++ ${ZCFLAGS} -shared -fpic -o cgi-env/wps_registry.zo ./service.c ${GDAL_LIBS} ${XML2LDFLAGS} ${MACOS_LD_FLAGS} ${ZOO_LDFLAGS} ${MACOS_LD_NET_FLAGS} ${XSLT_LDFLAGS} -lfcgi -L${ZRPATH}/zoo-kernel/ -lzoo_service ${ZRPATH}/zoo-kernel/server_internal.o ${ZRPATH}/zoo-kernel/lex.cr.o ${ZRPATH}/zoo-kernel/lex.sr.o ${ZRPATH}/zoo-kernel/service_conf.tab.o ${ZRPATH}/zoo-kernel/main_conf_read.tab.o ${ZRPATH}/zoo-kernel/response_print.o ${YAML_FILES} ${MS_FILES} ${MS_LDFLAGS} ${YAML_LDFLAGS}
    1919
    2020install:

  • trunk/zoo-project/zoo-services/utils/registry/service.c

    r778 r917  
    8080                                    root_nodes[1][1],"2.0.0",1);
    8181      setMapInMaps(conf,"main","rversion","2.0.0");
    82       printDescribeProcessForProcess(zooRegistry,conf,n,inherited);
     82      printDescribeProcessForProcess(zooRegistry,conf,doc,n,inherited);
    8383      setMapInMaps(conf,"main","rversion","1.0.0");
    8484

  • trunk/zoo-project/zoo-services/utils/status/Makefile

    r811 r917  
    11ZRPATH=../../..
    22include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
    3 CFLAGS=-I${INST_INCLUDE} ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
     3CFLAGS1=${CFLAGS} -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} ${FCGI_LDFLAGS} -L${ZRPATH}/zoo-kernel/ -lzoo_service
     6        g++ ${CFLAGS1} -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${ZRPATH}/zoo-kernel/ -lzoo_service
    77
    88install:

  • trunk/zoo-project/zoo-services/utils/status/service.c

    r788 r917  
    7272      return SERVICE_FAILED;
    7373    }
     74    map* tmpMap1=getMapFromMaps(conf,"lenv","semaphore");
     75    if(tmpMap1!=NULL && strcasecmp(tmpMap1->value,"Created")==0)
     76      removeShmLock(conf,1);
    7477    sprintf(xslFileName,"%s/updateStatus.xsl",tmpMmap->value);
    7578    xmlSubstituteEntitiesDefault(1);
    … …  
    8588       */
    8689      char *tmpStr=_getStatus(conf,tmpMap->value);
    87 #ifdef DEBUG
     90      //#ifdef DEBUG
    8891      fprintf(stderr,"DEBUG: %s \n",tmpStr);
    89 #endif
     92      //#endif
    9093      if(tmpStr!=NULL && strncmp(tmpStr,"-1",2)!=0){
    9194        char *tmpStr1=strdup(tmpStr);
    … …  
    140143      char message[10];
    141144      sprintf(message,"Step %d",i);
     145      fprintf (stderr, "RUN IN BACKGROUND MODE %s %d \n",__FILE__,__LINE__);
     146      fflush(stderr);
    142147      updateStatus(conf,i,message);
    143148#ifndef WIN32
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