Changeset 955


Ignore:
Timestamp:
Sep 20, 2019, 5:14:48 PM (2 months ago)
Author:
djay
Message:

Fix issue when RELY_ON_DB is on and data is published. Ensure to use WPS 3 only when required. Set wmfs_link, wfs_link or wcs_link only when found in the metadata.

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

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/zoo-kernel/caching.c

    r921 r955  
    2525#include <openssl/md5.h>
    2626#include <openssl/evp.h>
    27 #include "caching.h"
    2827#include "service.h"
    2928#include "service_internal.h"
    3029#include "response_print.h"
     30#include "caching.h"
    3131#ifdef MS_FORCE_LOCAL_FILE_USE
    3232#include "ogr_api.h"
  • trunk/zoo-project/zoo-kernel/response_print.c

    r949 r955  
    2323 */
    2424
     25#include "response_print.h"
    2526#ifdef USE_MS
    2627#include "service_internal_ms.h"
     
    3435#include "service_internal.h"
    3536#include "server_internal.h"
    36 #include "response_print.h"
    3737
    3838#ifndef WIN32
  • trunk/zoo-project/zoo-kernel/service.c

    r949 r955  
    130130    fflush(file);
    131131    tmp=tmp->next;
     132    cnt++;
    132133    if(limit>=0 && cnt==limit)
    133134      tmp=NULL;
    134     cnt++;
    135135  }
    136136  fflush(file);
  • trunk/zoo-project/zoo-kernel/service_callback.c

    r926 r955  
    2727 */
    2828
    29 #include "service_callback.h"
    3029#include "service_json.h"
    3130#include "service_internal_ms.h"
     
    4140#include <libxslt/transform.h>
    4241#include <libxslt/xsltutils.h>
     42
     43#include "service_callback.h"
    4344
    4445#ifdef __cplusplus
  • trunk/zoo-project/zoo-kernel/service_callback.h

    r917 r955  
    3232#pragma once
    3333
     34#include <ulinet.h>
    3435#include <stdio.h>
    3536#include <ctype.h>
    3637#include <service.h>
    37 #include <ulinet.h>
    3838
    3939#ifdef __cplusplus
  • trunk/zoo-project/zoo-kernel/service_internal_hpc.c

    r939 r955  
    10561056                maps* tmp=getMaps(*real_outputs,input->name);
    10571057                char serviceName[9];
    1058                 freeMap(&tmp->content);
    1059                 free(tmp->content);
    1060                 tmp->content=NULL;
    10611058                maps* output=getMaps(*real_outputs,input->name);
    10621059                setMapInMaps(output->child,"download_link","generated_file",targetPath);
     
    10671064                setMapInMaps(output->child,"download_link","asReference","true");
    10681065                setMapInMaps(output->child,"download_link","inRequest","true");
    1069                 setMapInMaps(output->child,"wms_link","generated_file",targetPath);
    1070                 setMapInMaps(output->child,"wms_link","storage",targetPath);
    1071                 setMapInMaps(output->child,"wms_link","useMapserver","true");
    1072                 setMapInMaps(output->child,"wms_link","msOgc","WMS");
    1073                 setMapInMaps(output->child,"wms_link","requestedMimeType","image/png");
    1074                 setMapInMaps(output->child,"wms_link","asReference","true");
    1075                 if(getMaps(output->child,"wcs_link")!=NULL){
    1076                   sprintf(serviceName,"wcs_link");
    1077                   setMapInMaps(output->child,"wcs_link","msOgc","WCS");
    1078                 }else{
    1079                   sprintf(serviceName,"wfs_link");
    1080                   setMapInMaps(output->child,"wfs_link","msOgc","WFS");
    1081                 }
    1082                 setMapInMaps(output->child,serviceName,"storage",targetPath);
    1083                 setMapInMaps(output->child,serviceName,"generated_file",targetPath);
    1084                 setMapInMaps(output->child,serviceName,"useMapserver","true");
    1085                 setMapInMaps(output->child,serviceName,"asReference","true");
     1066                if(getMaps(output->child,"wms_link")!=NULL){
     1067                  setMapInMaps(output->child,"wms_link","generated_file",targetPath);
     1068                  setMapInMaps(output->child,"wms_link","storage",targetPath);
     1069                  setMapInMaps(output->child,"wms_link","useMapserver","true");
     1070                  setMapInMaps(output->child,"wms_link","msOgc","WMS");
     1071                  setMapInMaps(output->child,"wms_link","requestedMimeType","image/png");
     1072                  setMapInMaps(output->child,"wms_link","asReference","true");
     1073                  if(getMaps(output->child,"wcs_link")!=NULL){
     1074                    sprintf(serviceName,"wcs_link");
     1075                    setMapInMaps(output->child,"wcs_link","msOgc","WCS");
     1076                  }else{
     1077                    sprintf(serviceName,"wfs_link");
     1078                    setMapInMaps(output->child,"wfs_link","msOgc","WFS");
     1079                  }
     1080                  setMapInMaps(output->child,serviceName,"storage",targetPath);
     1081                  setMapInMaps(output->child,serviceName,"generated_file",targetPath);
     1082                  setMapInMaps(output->child,serviceName,"useMapserver","true");
     1083                  setMapInMaps(output->child,serviceName,"asReference","true");
     1084                }
     1085                freeMap(&tmp->content);
     1086                free(tmp->content);
     1087                tmp->content=NULL;
    10861088              }else{
    10871089                map* hpcStdErr=getMapFromMaps(*main_conf,"henv","StdErr");
  • trunk/zoo-project/zoo-kernel/service_internal_ms.c

    r921 r955  
    15281528  msFreeMap(myMap);
    15291529  //msFree(myMap);
    1530   msGDALCleanup();
     1530  //msGDALCleanup();
    15311531}
    15321532
  • trunk/zoo-project/zoo-kernel/sqlapi.c

    r926 r955  
    3131#endif
    3232
     33#include <fcgi_stdio.h>
    3334#include "sqlapi.h"
    34 #include <fcgi_stdio.h>
    35 #include <stdlib.h>
    3635
    3736/**
  • trunk/zoo-project/zoo-kernel/ulinet.c

    r944 r955  
    269269 */
    270270char* getProvenance(maps* conf,const char* url){
     271  int i=0;
    271272  map* sharedCache=getMapFromMaps(conf,"security","shared");
    272273  char *res="OTHER";
     
    285286    }
    286287  }
    287   for(int i=0;i<2;i++){
     288  for(i=0;i<2;i++){
    288289    sharedCache=getMapFromMaps(conf,"main",paths[i]);
    289290    if(sharedCache!=NULL){
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r949 r955  
    6969#include "response_print.h"
    7070#include "request_parser.h"
    71 #include "sqlapi.h"
    7271#ifdef USE_JSON
    7372#include "caching.h"
    7473#endif
     74#include "sqlapi.h"
    7575
    7676#ifdef META_DB
     
    18721872 
    18731873  setMapInMaps(m,"lenv","executionType","xml");
    1874   if((strlen(cgiQueryString)>0 && cgiQueryString[0]=='/') || strstr(cgiAccept,"json")!=NULL){
     1874  if((strlen(cgiQueryString)>0 && cgiQueryString[0]=='/') && strstr(cgiAccept,"json")!=NULL){
    18751875  //
    18761876  // OGC API - Processing starts here
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