Changeset 926 for trunk/zoo-project


Ignore:
Timestamp:
May 28, 2019, 11:33:18 AM (6 months ago)
Author:
djay
Message:

Fix issue with version parameter for GetCapabilities?, issue with DescribeProcess? (version 2.0.0) and fix to build on MacOS

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

Legend:

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

    r921 r926  
    2323 */
    2424
    25 #include "service.h"
    26 #include "service_internal.h"
    27 #include "server_internal.h"
    28 #include "response_print.h"
    2925#ifdef USE_MS
    3026#include "service_internal_ms.h"
     
    3531#include "service_callback.h"
    3632#endif
     33#include "service.h"
     34#include "service_internal.h"
     35#include "server_internal.h"
     36#include "response_print.h"
    3737
    3838#ifndef WIN32
     
    4141
    4242#include "mimetypes.h"
    43 
    4443
    4544/**
     
    10141013
    10151014  n=nc;
    1016  
    10171015  int wpsId=zooXmlAddNs(NULL,schemas[vid][3],"wps");
    10181016  ns=usedNs[wpsId];
     
    14271425        int oI=0;
    14281426        /*if(vid==0)*/ {
    1429           for(oI=0;oI<13;oI++)
     1427          for(oI=0;oI<12;oI++)
    14301428            if((tmp1=getMap(_tmp->content,orderedFields[oI]))!=NULL){
    14311429#ifdef DEBUG
     
    21012099    printf("Content-Type: text/xml; charset=%s\r\nStatus: 200 OK\r\n\r\n",encoding);
    21022100  }
    2103   fflush(stdout);
    21042101  xmlChar *xmlbuff;
    21052102  int buffersize;
  • trunk/zoo-project/zoo-kernel/response_print.h

    r923 r926  
    9494#include <libxml/parser.h>
    9595#include <libxml/xpath.h>
     96#include "cgic.h"
    9697
    9798#ifdef __cplusplus
  • trunk/zoo-project/zoo-kernel/service_callback.c

    r917 r926  
    435435      maps* curs=inputs;
    436436      dumpMaps(curs);
    437       char *keys[11][2]={
     437      const char *keys[11][2]={
    438438        {
    439439          "xlink:href",
     
    614614      maps* curs=outputs;
    615615      dumpMaps(curs);
    616       char *keys[10][2]={
     616      const char *keys[10][2]={
    617617        {
    618618          "Reference",
     
    656656        }       
    657657      };
    658       char* specifics[5][2]={
     658      const char* specifics[5][2]={
    659659        {
    660660          "download_link",
     
    767767    case 6: {
    768768      // Finalize HPC
    769       char *keys[6][2]={
     769      const char *keys[6][2]={
    770770        {
    771771          //"SubmitTime",
  • trunk/zoo-project/zoo-kernel/service_internal_python.c

    r921 r926  
    351351  PyObject *ptype, *pvalue, *ptraceback,*pValue,*pArgs;
    352352  PyErr_Fetch(&ptype, &pvalue, &ptraceback);
    353   char *pStrErrorMessage = PyString_AsString(pvalue);
     353  const char *pStrErrorMessage = PyString_AsString(pvalue);
    354354  char *tmp0=_("Python module %s cannot be loaded. Message: %s\n");
    355355 
     
    698698    if(strncmp(PyString_AsString(key),"child",5)!=0){
    699699      if(strncmp(PyString_AsString(key),"value",5)==0){
    700         char *buffer=NULL;
     700        const char *buffer=NULL;
    701701        Py_ssize_t size;
    702702#if PY_MAJOR_VERSION >= 3
     
    720720        res = addToMapWithSize(res,PyString_AsString(key),buffer,size);
    721721      }else{
    722         char* lkey=PyString_AsString(key);
    723         char* lvalue=PyString_AsString(value);
     722        const char* lkey=PyString_AsString(key);
     723        const char* lvalue=PyString_AsString(value);
    724724        if(res!=NULL){
    725725          if(PyString_Size(value)>0)
     
    759759        PyObject* key;
    760760        PyObject* value;
    761         char *buffer = NULL;
     761        const char *buffer = NULL;
    762762        Py_ssize_t size;
    763763        for(int i = 0; i < nb; i++) {
  • trunk/zoo-project/zoo-kernel/sqlapi.c

    r923 r926  
    7171  maps* cconf=getMaps(conf,key);
    7272  if(cconf==NULL){
    73     fprintf(stderr,"%s %d\n",__FILE__,__LINE__);
    7473    return "-1";
    7574  }
  • trunk/zoo-project/zoo-kernel/sqlapi.h

    r923 r926  
    5151#endif
    5252
    53  
    5453#ifdef META_DB
    5554  ZOO_DLL_EXPORT char* _createInitString(maps*,const char*);
  • trunk/zoo-project/zoo-kernel/zoo_service_loader.c

    r921 r926  
    12401240  }else{
    12411241    checkValidValue(request_inputs,&err,"AcceptVersions",(const char**)vvv,-1);
     1242    map* tmpMap=getMapFromMaps(m,"main","version");
     1243    if(tmpMap!=NULL){
     1244      setMapInMaps(m,"main","rversion",tmpMap->value);
     1245      addToMap(request_inputs,"version",tmpMap->value);
     1246    }else{
     1247      setMapInMaps(m,"main","rversion","1.0.0");
     1248      addToMap(request_inputs,"version","1.0.0");
     1249    }
    12421250    map* version1=getMap(request_inputs,"AcceptVersions");
    12431251    if(version1!=NULL){
     
    12471255        addToMap(request_inputs,"version",version1->value);
    12481256      version=getMap(request_inputs,"version");
    1249       setMapInMaps(m,"main","rversion",version->value);
    1250       vid=getVersionId(version->value);
    12511257    }
    12521258  }
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