Changeset 434


Ignore:
Timestamp:
Jul 6, 2013, 10:43:07 AM (11 years ago)
Author:
djay
Message:

Fixed verbose output when using W*S output in r434 (ticket #!0).

Location:
trunk/zoo-project
Files:
3 edited

Legend:

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

    r433 r434  
    22  * Fix POST Request issue (ticket #34)
    33  * Fix COOKIE gesture (ticket #79)
     4  * Remove verbose messages when using MapServer W*S (ticket #80)
     5  * Add COMMITTERS  and LICENSE files
    46
    57Version 1.3.0-rc1
  • trunk/zoo-project/LICENSE

    r428 r434  
    1010
    1111Copyright (c) 2009-2013 GeoLabs SARL
     12Copyright 2010-2011 Fondazione Edmund Mach. All rights reserved.
    1213
    1314Permission is hereby granted, free of charge, to any person obtaining a copy
  • trunk/zoo-project/zoo-kernel/service_internal_ms.c

    r402 r434  
    118118  char options[3][5][25]={
    119119    {"WMS","1.3.0","GetMap","layers=%s","wms_extent"},
    120     {"WFS","1.1.0","GetFeature","typename=%s","wms_extent"},
     120    {"WFS","1.1.0","GetFeature","typename=%s","wcs_extent"},
    121121    {"WCS","1.1.0","GetCoverage","coverage=%s","wcs_extent"}
    122122  };
     
    328328      sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.y,min.x,max.y,max.x);
    329329      map* isGeo=getMap(output->content,"crs_isGeographic");
     330#ifdef DEBUGMS
    330331      fprintf(stderr,"isGeo = %s\n",isGeo->value);
     332#endif
    331333      if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
    332334        sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
     
    338340      map* isGeo=getMap(output->content,"crs_isGeographic");
    339341      if(isGeo!=NULL){
     342#ifdef DEBUGMS
    340343        fprintf(stderr,"isGeo = %s\n",isGeo->value);
     344#endif
    341345        if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
    342346          sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
     
    396400  fclose(fileZ);
    397401  free(buffer);
     402#ifdef DEBUGMS
    398403  fprintf(stderr,"Try loading %s",dsName);
     404#endif
    399405  poDS1 = OGROpen( dsName, FALSE, poDriver1 );
    400406  if( poDS1 == NULL ){
     
    403409    OGR_DS_Destroy(poDS1);
    404410  }else{
     411#ifdef DEBUGMS
    405412    fprintf(stderr,"The DataSource is a  ZIP File\n");
     413#endif
    406414    char** demo=VSIReadDir(dsName);
    407415    int i=0;
     
    412420                );
    413421    while(demo[i]!=NULL){
     422#ifdef DEBUGMS
    414423      fprintf(stderr,"ZIP File content : %s\n",demo[i]);
     424#endif
    415425      char *tmpDs=(char*)malloc((strlen(dsName)+strlen(demo[i])+2)*sizeof(char));
    416426      sprintf(tmpDs,"%s/%s",dsName,demo[i]);
     
    418428     
    419429      VSILFILE* vsif=VSIFOpenL(tmpDs,"rb");
     430#ifdef DEBUGMS
    420431      fprintf(stderr,"open : %s\n",tmpDs);
     432#endif
    421433      VSIFSeekL(vsif,0,SEEK_END);
    422434      int size=VSIFTellL(vsif);
     435#ifdef DEBUGMS
    423436      fprintf(stderr,"size : %d\n",size);
     437#endif
    424438      VSIFSeekL(vsif,0,SEEK_SET);
    425439      char *vsifcontent=(char*) malloc((size+1)*sizeof(char));
     
    435449        tmpP=strstr(fpath,".SHP");
    436450      if(tmpP!=NULL){
     451#ifdef DEBUGMS
    437452        fprintf(stderr,"*** DEBUG %s\n",strstr(tmpP,"."));
     453#endif
    438454        if( strcmp(tmpP,".shp")==0 || strcmp(tmpP,".SHP")==0 ){
    439455          tmpMap=getMap(output->content,"storage");
     
    442458          sprintf(tmpMap->value,"%s",fpath);
    443459          pszDataSource=tmpMap->value;
     460#ifdef DEBUGMS
    444461          fprintf(stderr,"*** DEBUG %s\n",pszDataSource);
     462#endif
    445463        }
    446464      }
     
    490508
    491509    layerObj* myLayer=m->layers[m->numlayers];
     510#ifdef DEBUGMS
    492511    dumpMaps(output);
     512#endif
    493513    myLayer->name = strdup(output->name);
    494514    myLayer->tileitem=NULL;
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