Changeset 908


Ignore:
Timestamp:
May 4, 2019, 4:56:11 PM (2 weeks ago)
Author:
djay
Message:

Update HISTORY.txt. Fix file size issue. Fix issue #168. Add missing xslt file.

Location:
branches/prototype-v0/zoo-project
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed
  • branches/prototype-v0/zoo-project/HISTORY.txt

    r817 r908  
    11Version 1.7.0-dev
     2  * Fix issue with UOM definitions in zcfg2sql
     3  * Make callback and HPC support independent from each other
     4  * Update SAGA-GIS support to version 7.2.0
     5  * Add support for custom MapServer style definition for raster output
     6  * Fix returned bbox definition #170
     7  * Store semaphore status in lenv section for future deletion
     8  * Update Windows support to newer compiler
     9  * Fix issue with UpdateStatus function from the Mono ZOO-API
     10  * Add logging functionality and other utility functions to the C-API
     11  * Return an exception for every output for which nb_pixel or
     12  nb_features is 0
     13  * Add a shared key to the security section to differentiate the
     14  referenced data
     15  * Add MapServer output style definition depending on the geometry
     16  type
     17  * Add ogr.tindex service
     18  * Add support for literaldata input arrays and to call services
     19  asyncrhonously from the JavaScript ZOO-API   
     20  * Expose a sleep function to the JavaScript ZOO-API
     21  * Provide FinalizeHPC and FinalizeHPC1 services using scontrol and
     22  sacct respectively 
     23  * Store md5sum of the cached file (so, local to the WPS server) to
     24  compare before uploading (if different md5sum) on the HPC server
     25  * Add support for R language
     26  * Add support for using "file://"  for referenced data input
     27  * Add an optional ecookie key for returning third-party cookies
     28  * Fix issue when parsing BoundingBox input #163
     29  * Add memory key to the main section to force the ZOO-Kernel to load
     30  data into memory or use local file
     31  * Add the dialect input to the ogr2ogr service
     32  * Store the list of generated mapfiles in a file (cf DeleteData service)
     33  * Define the correct MS_IMAGEMODE in the generated mapfile
     34  * Option to use MapServer support to publish heatmap
     35  * Add status_code key to the lenv for setting Status HTTP response header
     36  * Add the Creation Option inputs to the Gdal_Dem service
     37  * Add prohibited key in the callback section to define a list of
     38  services not requiring any invocation
     39  * Produce zcfg for OTB applications using the correct default pixel type
     40  * Add asynchronous callback invocation to send information about
     41  the ongoing services to a third-party software
     42  * Add mapsToJson, mapsToJson, and elementsToJson to the API
     43  * Provide a zcfg2sql tool to convert a zcfg metadata file to SQL script
     44  * Add support to store service metadata information into a database
     45  * Add HPC Support for remote execution of SBATCH scripts through Slurm
     46  * Add cookie reference to _HINTERNET
     47  * Support headers for GET requests from the js ZOO-API
    248  * Pass all headers listed in the attributes parameter from the
    349  [security] section to the hosts listed in the hosts parameter of the
  • branches/prototype-v0/zoo-project/zoo-api/r/minimal.r

    r874 r908  
    44
    55ZOOUpdateStatus <- function(a,b) {
    6     .Call("ZOOUpdateStatus",a,b)
     6    .Call("ZOOUpdateStatus",a,as.numeric(b))
    77}
  • branches/prototype-v0/zoo-project/zoo-kernel/Makefile.in

    r902 r908  
    123123        g++ -shared  ${GDAL_CFLAGS} ${DEFAULT_OPTS} -fpic -o libzoo_service.${EXT} ${CFLAGS}  service_internal.o service.o sqlapi.o ${FCGI_LDFLAGS} ${GDAL_LIBS} ${ZOO_LDFLAGS} ${MACOS_LD_FLAGS}
    124124
    125 zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${R_FILE} ${SAGA_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} service_callback.o
     125zoo_loader.cgi: version.h libzoo_service.${EXT} zoo_loader.c zoo_service_loader.o  ulinet.o service.h lex.sr.o service_conf.tab.o service_conf.y ulinet.o main_conf_read.tab.o lex.cr.o request_parser.o response_print.o server_internal.o caching.o ${MS_FILE} ${PYTHON_FILE} ${PHP_FILE} ${JAVA_FILE} ${JS_FILE} ${PERL_FILE} ${RUBY_FILE} ${YAML_FILE} ${OTB_FILE} ${R_FILE} ${SAGA_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${CALLBACK_FILE}
    126126        g++ -g -O2 ${JSON_CFLAGS} ${JSCFLAGS} ${PHPCFLAGS}  ${PERLCFLAGS} ${RUBYCFLAGS}  ${JAVACFLAGS} ${XML2CFLAGS} ${PYTHONCFLAGS} ${CFLAGS} -c zoo_loader.c  -fno-common -DPIC -o zoo_loader.o
    127         g++  ${JSON_CFLAGS} ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${R_FILE} service_callback.o response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS}
     127        g++  ${JSON_CFLAGS} ${JSCFLAGS} ${SAGA_CFLAGS} ${OTBCFLAGS} ${GDAL_CFLAGS} ${XML2CFLAGS} ${PHPCFLAGS} ${PERLCFLAGS} ${JAVACFLAGS} ${PYTHONCFLAGS} ${CFLAGS} zoo_loader.o zoo_service_loader.o ${MS_FILE} ${PYTHON_FILE}  ${PERL_FILE} ${PHP_FILE}  ${JS_FILE} ${JAVA_FILE} ${YAML_FILE} ${OTB_FILE} ${SAGA_FILE} ${MONO_FILE} ${HPC_FILES} ${METADB_FILE} ${JSON_FILE} ${R_FILE} ${CALLBACK_FILE} response_print.o server_internal.o caching.o request_parser.o ulinet.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o -o zoo_loader.cgi -L. ${LDFLAGS}
    128128
    129 zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main_conf_read.tab.o lex.cr.o response_print.o server_internal.o service_internal.o ${MS_FILE} ${YAML_FILE}
     129zcfg2yaml: zcfg2yaml.c service.h lex.sr.o service_conf.tab.o service_conf.y main_conf_read.tab.o lex.cr.o response_print.o server_internal.o service_internal.o ${MS_FILE} ${YAML_FILE} ${CALLBACK_FILE}
    130130        g++ -g -O2 ${JSCFLAGS} ${RUBYCFLAGS} ${XML2CFLAGS} ${CFLAGS} -c zcfg2yaml.c  -fno-common -DPIC -o zcfg2yaml.o
    131         g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o caching.o ulinet.o service_callback.o server_internal.o service_internal.o ${MS_FILE} response_print.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o  ${YAML_FILE} -o zcfg2yaml -L. ${LDFLAGS}
     131        g++  ${XML2CFLAGS} ${CFLAGS} zcfg2yaml.o caching.o ulinet.o ${CALLBACK_FILE} server_internal.o service_internal.o ${MS_FILE} response_print.o lex.cr.o lex.sr.o service_conf.tab.o main_conf_read.tab.o  ${YAML_FILE} -o zcfg2yaml -L. ${LDFLAGS}
    132132
    133133install: zoo_loader.cgi
  • branches/prototype-v0/zoo-project/zoo-kernel/caching.c

    r899 r908  
    2929#include "service_internal.h"
    3030#include "response_print.h"
    31 
     31#ifdef MS_FORCE_LOCAL_FILE_USE
     32#include "ogr_api.h"
     33#include "mapserver.h"
     34#endif
    3235/**
    3336 * Compute md5
     
    677680  char *mimeType=NULL;
    678681  char *origin=NULL;
    679   int fsize=0;
     682  long long fsize=0;
    680683  map* memUse=getMapFromMaps(*m,"main","memory");
    681684
     
    756759 
    757760  char ltmp1[256];
    758   sprintf(ltmp1,"%d",fsize);
     761  sprintf(ltmp1,"%ld",fsize);
    759762  addToMap(*content,"size",ltmp1);
    760763  if(cached==NULL){
     
    782785    }
    783786  }
    784   free(fcontent);
    785   free(mimeType);
    786   free(cached);
     787  if(fcontent!=NULL)
     788    free(fcontent);
     789  if(mimeType!=NULL)
     790    free(mimeType);
     791  if(cahced!:NULL)
     792    free(cached);
    787793  return 0;
    788794}
  • branches/prototype-v0/zoo-project/zoo-kernel/request_parser.c

    r890 r908  
    2828#include "response_print.h"
    2929#include "caching.h"
     30#include "cgic.h"
    3031
    3132/**
  • branches/prototype-v0/zoo-project/zoo-kernel/response_print.c

    r902 r908  
    672672    }
    673673    nc3=NULL;
     674    map* sType=getMap(serv->content,"serviceType");
    674675    for(;i<limit;i+=2){
    675676      if(capabilities[vid][i]==NULL)
     
    687688            xmlNewNsProp(nc1,ns,BAD_CAST capabilities[vid][i],BAD_CAST tmp1->value);
    688689        }
    689         else
    690           xmlNewNsProp(nc1,ns,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
     690        else{
     691          if(i==3 && vid==1 && sType!=NULL && strstr(sType->value,"HPC")!=NULL)
     692            xmlNewNsProp(nc1,ns,BAD_CAST capabilities[vid][i],BAD_CAST "async-execute dismiss");
     693          else
     694            xmlNewNsProp(nc1,ns,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
     695        }
    691696      }
    692697    }
     
    718723 * @param content the servive main content created from the zcfg file
    719724 * @param vid the version identifier (0 for 1.0.0 and 1 for 2.0.0)
    720  */
    721 void attachAttributes(xmlNodePtr n,xmlNsPtr ns,map* content,int vid){
     725 * @param serviceType string containing the current service type
     726 */
     727void attachAttributes(xmlNodePtr n,xmlNsPtr ns,map* content,int vid,map* serviceType){
    722728  int limit=7;
    723729  for(int i=1;i<limit;i+=2){
     
    738744    }
    739745    else{
    740       if(vid==0 && i>=2)
    741         xmlNewProp(n,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
     746      if(i==3 && vid==1 && serviceType!=NULL && strstr(serviceType->value,"HPC")!=NULL)
     747        xmlNewNsProp(n,ns,BAD_CAST capabilities[vid][i],BAD_CAST "async-execute dismiss");
    742748      else
    743         xmlNewNsProp(n,ns,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
     749        if(vid==0 && i>=2)
     750          xmlNewProp(n,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
     751        else
     752          xmlNewNsProp(n,ns,BAD_CAST capabilities[vid][i],BAD_CAST capabilities[vid][i+1]);
    744753    }
    745754  }
     
    10241033  if(vid==0){
    10251034    nc = xmlNewNode(NULL, BAD_CAST "ProcessDescription");
    1026     attachAttributes(nc,ns,serv->content,vid);
     1035    attachAttributes(nc,ns,serv->content,vid,NULL);
    10271036  }
    10281037  else{
     
    10411050      }
    10421051    }
    1043     attachAttributes(nc2,NULL,serv->content,vid);
     1052    attachAttributes(nc2,NULL,serv->content,vid,serviceType);
    10441053    map* level=getMap(serv->content,"level");
    10451054    if(level!=NULL && strcasecmp(level->value,"generic")==0)
  • branches/prototype-v0/zoo-project/zoo-kernel/server_internal.c

    r902 r908  
    374374  }
    375375  fseek(file, 0, SEEK_END);
    376   long count = ftell(file);
    377   sprintf(rsize,"%lld",ftell(file));
     376  zStatStruct f_status;
     377  int s=zStat(filename, &f_status);
     378  sprintf(rsize,"%lld",file_status.st_size);
    378379  rewind(file);
    379380  if(getMap(content,"storage")==NULL){
  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_hpc.c

    r902 r908  
    3434#include "mimetypes.h"
    3535#include <sys/un.h>
    36 #include "cgic.h"
    3736
    3837typedef struct {
  • branches/prototype-v0/zoo-project/zoo-kernel/service_internal_python.h

    r899 r908  
    2828#pragma once
    2929
     30#include <Python.h>
    3031#include "service_internal.h"
    3132#include "response_print.h"
    32 #include <Python.h>
    3333#ifdef WIN32
    3434#include <windows.h>
    3535#include <direct.h>
    3636#endif
    37 #include "cgic.h"
    3837
    3938PyDictObject* PyDict_FromMaps(maps* t);
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