Changeset 984 for trunk/zoo-project


Ignore:
Timestamp:
Mar 3, 2021, 3:41:55 PM (4 years ago)
Author:
djay
Message:

Take into account building ZOO-Project on ubuntu focal (cf. ​https://trac.osgeo.org/osgeolive/ticket/2282). Add the OTB and SAGA support to the Dockerfile to make the corresponding demos using docker WPS server. Add OGC API - Processes demo to the demos list.

Location:
trunk/zoo-project
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/zoo-project/HISTORY.txt

    r982 r984  
    11Version 1.8.1
     2  * Make all demos running within docker
    23  * Deploy demo HTML UI from github from the Dockerfile
    34  * Add demo ZOO-Services build in the Dockerfile

  • trunk/zoo-project/zoo-kernel/configure.ac

    r982 r984  
    415415CPPFLAGS_SAVE="$CPPFLAGS"
    416416CPPFLAGS="$PROJ_CPPFLAGS"
    417 AC_CHECK_HEADERS([proj_api.h],
    418                  [], [AC_MSG_ERROR([could not find headers include related to PROJ4])])
    419417
    420418AC_SUBST([PROJ_CPPFLAGS])
    … …  
    607605        echo $PYTHONCONFIG
    608606        # Extract the linker and include flags
    609         PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
     607        #PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
     608        PYTHON_LDFLAGS=$($PYTHONCONFIG --ldflags | sed "s:python${PYTHON_VERS}/config-${PYTHON_VERS}-::g")
    610609        PYTHON_CPPFLAGS=`$PYTHONCONFIG --includes`
    611610
    … …  
    618617        # Ensure we can link against libphp
    619618        LIBS_SAVE="$LIBS"
    620         LIBS="$PYTHON_LDFLAGS"
    621         PY_LIB=`$PYTHONCONFIG --libs | sed \
    622                               -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
    623         AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
     619        #LIBS="$PYTHON_LDFLAGS"
     620        #PY_LIB=`$PYTHONCONFIG --libs | sed \
     621        #                     -e 's/.*\(python[[0-9]]\.[[0-9]]\).*/\1/'`
     622        #AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
     623        LIBS="m $PYTHON_LDFLAGS -lpython${PYTHON_VERS}"
     624        PYTHON_LDFLAGS="-l$LIBS"
     625        LDFLAGS=$PYTHON_LDFLAGS
     626        AC_CHECK_LIB([], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
    624627        LIBS="$LIBS_SAVE"
    625628fi

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

    r961 r984  
    154154  my_maps=my_map;
    155155  my_maps->name=NULL;
     156  my_maps->content=NULL;
     157  my_maps->child=NULL;
     158  my_maps->next=NULL;
    156159  current_maps=my_maps;
    157160 

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

    r967 r984  
    838838        else
    839839          pmsCursor->next->child=NULL;
     840        return;
    840841      }
    841842      else{

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

    r955 r984  
    12721272  m->numlayers++;
    12731273  GDALClose( hDataset );
     1274#ifndef RELY_ON_DB
    12741275  GDALDestroyDriverManager();
     1276#endif
    12751277  CPLCleanupTLS();
    12761278  storeMd5(pszFilename);

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

    r962 r984  
    211211                }else{
    212212                  if(type == ParameterType_OutputVectorData){
    213                       char* ext="json";
     213                      const char* ext="json";
    214214                      if(tmpVal!=NULL){
    215215                        if(strncasecmp(tmpVal->value,"text/xml",8)==0)
    … …  
    232232                  else
    233233                    if(type == ParameterType_OutputFilename){
    234                       char* ext="txt";
     234                      const char* ext="txt";
    235235                      if(tmpVal!=NULL){
    236236                        if(strncasecmp(tmpVal->value,"text/xml",8)==0)
    … …  
    308308                    char tmp[1024];
    309309                    map* tmpVal=getMapFromMaps(inputs,paramKey.c_str(),"mimeType");
    310                     char* ext="json";
     310                    const char* ext="json";
    311311                    if(tmpVal!=NULL){
    312312                      if(strncasecmp(tmpVal->value,"application/zip",14)==0){
    … …  
    362362                  else
    363363                    if(type == ParameterType_InputImage
    364                        || type == ParameterType_ComplexInputImage || type == ParameterType_InputVectorData
     364                       || type == ParameterType_InputVectorData
    365365                       || type == ParameterType_InputFilename){
    366366                      m_Application->SetParameterString(paramKey, test->value);
    … …  
    403403                        long count;
    404404                       
    405                         char *exts[4];
     405                        const char *exts[4];
    406406                        exts[0]=".shp";
    407407                        exts[1]=".shx";

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

    r640 r984  
    3636#include "service_internal.h"
    3737#include "service.h"
    38 #include "cgic.h"
    3938#ifdef WIN32
    4039#include <windows.h>
    4140#include <direct.h>
    4241#endif
    43 #include <vector>
    44 #include <string>
    4542
    4643/**

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

    r945 r984  
    3434#include "jsapi.h"
    3535#endif
    36 #include "fcgi_stdio.h"
    3736#include <stdlib.h>
    3837#include <fcntl.h>

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

    r982 r984  
    18861886  FILE *f0, *f1;
    18871887  HINTERNET hInternet;
    1888   service *s1;
     1888  service *s1=NULL;
    18891889  maps *request_output_real_format = NULL;
    18901890  maps *request_input_real_format = NULL;
    … …  
    25522552      printf("\n");
    25532553      fflush(stdout);
     2554      json_object_put(res);
    25542555    }
    25552556    //return 1;
    … …  
    34533454#else
    34543455      recordResponse(m,fbkp1);
     3456#ifdef USE_CALLBACK
    34553457      if (eres == SERVICE_SUCCEEDED)
    3456 #ifdef USE_CALLBACK
    34573458        invokeCallback(m,NULL,request_output_real_format,6,0);
    34583459#endif
    … …  
    34933494#endif
    34943495  }
    3495  
    3496   freeService (&s1);
    3497   free (s1);
     3496
     3497  if(s1!=NULL){
     3498    freeService (&s1);
     3499    free (s1);
     3500  }
    34983501  freeMaps (&m);
    34993502  free (m);

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

    r917 r984  
    3838#include "service_internal.h"
    3939
    40 extern "C" {
    4140#include <libxml/tree.h>
    4241#include <libxml/parser.h>
    … …  
    4443#include <libxml/xpathInternals.h>
    4544
    46 /*#include <openssl/sha.h>
    47 #include <openssl/hmac.h>
    48 #include <openssl/evp.h>
    49 #include <openssl/bio.h>
    50 #include <openssl/buffer.h>
    51 */
     45extern "C" {
    5246
    5347  void printExceptionReportResponse(maps*,map*);

  • trunk/zoo-project/zoo-services/utils/open-api/templates/index.html

    r967 r984  
    1818#import json
    1919#if "cache_file" in $inputs["tmpl"]
    20 #set values=json.load(open($inputs["tmpl"]["cache_file"]))
     20#set values=json.load(open($inputs["tmpl"]["cache_file"], encoding='utf-8'))
    2121#else
    22 #set values=$inputs["tmpl"]["value"]
     22#set values=json.loads($inputs["tmpl"]["value"])
    2323#end if
    2424#except Exception as e
    2525$e
     26#set values={}
    2627#end try
    2728<html lang="en">
    … …  
    202203 #end if
    203204#end if
    204 #if $obj["maxOccurs"]>1
     205#if $obj["maxOccurs"]=="unbounded" or $obj["maxOccurs"]>1
    205206        <div class="btn-group" role="group" aria-label="Basic example">
    206207          <button type="button" class="btn btn-secondary" onclick="addElementToList(\$(this));">Add</button>
    … …  
    525526      <hr>
    526527      <address>$openapi["openapi"]["rootUrl"]$(currentUrl).html</address>
    527       <!-- hhmts start -->Last modified: Wed Dec 16 16:06:56 CET 2020 <!-- hhmts end -->
     528      <!-- hhmts start -->Last modified: Mon Mar  1 17:01:50 CET 2021 <!-- hhmts end -->
    528529    </main>
    529530#if $currentKey=="root"
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