Changeset 945


Ignore:
Timestamp:
Aug 14, 2019, 4:30:34 PM (5 weeks ago)
Author:
djay
Message:

Fix the issue with JavaScript? support and GDAL profile service

Location:
trunk/zoo-project
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/zoo-project/HISTORY.txt

    r944 r945  
    11Version 1.8.0-dev
    2   * Fix #172
     2  * Fix issue in case JavaScript support is activated
     3  * Fix issue with GDAL profile service
     4  * Fix #172 for https support
    35Version 1.7.0
    46  * Fix issue with UOM definitions in zcfg2sql
  • trunk/zoo-project/zoo-kernel/response_print.c

    r943 r945  
    10011001 */
    10021002void printDescribeProcessForProcess(registry *reg, maps* m,xmlDocPtr doc,xmlNodePtr nc,service* serv){
    1003   xmlNsPtr ns,ns_ows,ns_xlink; 
     1003  xmlNsPtr ns,ns_ows,ns_xlink;
    10041004  xmlNodePtr n,nc1;
    10051005  xmlNodePtr nc2 = NULL;
     
    11461146        xmlNewProp(nc2,BAD_CAST "maxOccurs",BAD_CAST "1");
    11471147      if((tmp1=getMap(e->content,"maximumMegabytes"))!=NULL){
    1148         xmlNewProp(nc2,BAD_CAST "maximumMegabytes",BAD_CAST tmp1->value);
     1148        if(vid==0)
     1149          xmlNewProp(nc2,BAD_CAST "maximumMegabytes",BAD_CAST tmp1->value);
    11491150      }
    11501151    }
     
    12431244          }
    12441245        }
    1245      
     1246
     1247        if((tmp1=getMap(e->content,"maximumMegabytes"))!=NULL){
     1248          if(vid==1)
     1249            xmlNewProp(nc5,BAD_CAST "maximumMegabytes",BAD_CAST tmp1->value);
     1250        }
     1251
     1252
    12461253        tmp1=_tmp->content;
    12471254
     
    16171624            }
    16181625          }
     1626
     1627        if((tmp1=getMap(e->content,"maximumMegabytes"))!=NULL){
     1628          if(vid==1)
     1629            xmlNewProp(nc5,BAD_CAST "maximumMegabytes",BAD_CAST tmp1->value);
     1630        }
     1631
    16191632        tmp1=_tmp->content;
    16201633        int oI=0;
  • trunk/zoo-project/zoo-kernel/service_internal.c

    r921 r945  
    198198  int res=-1;
    199199  if(s!=NULL){
     200    int fcntlRes;
    200201    s->lock.l_type = F_UNLCK;
    201202    res=fcntl(fileno(s->lockfile), F_SETLK, &s->lock);
    202203    if(res==-1)
    203204      return res;
    204     fclose(s->lockfile);
    205205#ifndef WIN32
    206206    // Check if there is any process locking a file and delete the lock if not.
    207207    s->lock.l_type = F_WRLCK;
    208     if(fcntl(fileno(s->lockfile), F_GETLK, &s->lock)!=-1 && s->lock.l_type == F_UNLCK){
    209 #endif
     208    fcntlRes=fcntl(fileno(s->lockfile), F_GETLK, &s->lock);
     209    if(fcntlRes!=1 && s->lock.l_type == F_UNLCK){
     210#endif
     211      fclose(s->lockfile);
    210212      zUnlink(s->filename);
    211213#ifndef WIN32
  • trunk/zoo-project/zoo-kernel/ulinet.h

    r944 r945  
    2626#define _ULINET_H 1
    2727
     28#ifdef USE_JS
     29#ifdef WIN32
     30#define XP_WIN 1
     31#else
     32#define XP_UNIX 0
     33#endif
     34#include "jsapi.h"
     35#endif
    2836#include "fcgi_stdio.h"
    2937#include <stdlib.h>
     
    3745#include <string.h>
    3846#include "time.h"
    39 #ifdef USE_JS
    40 #ifdef WIN32
    41 #define XP_WIN 1
    42 #else
    43 #define XP_UNIX 0
    44 #endif
    45 #include "jsapi.h"
    46 #endif
    4747#ifndef __cplusplus
    4848// knut: see new def of bool in service.h
  • trunk/zoo-project/zoo-services/gdal/profile/service.c

    r371 r945  
    182182#endif
    183183  }
     184  GDALClose(hDataset);
    184185  OGRCleanupAll();
    185   GDALClose(hDataset);
    186186  GDALDestroyDriverManager();
    187187#ifdef ZOO_SERVICE
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