Changeset 434

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:

• HISTORY.txt (modified) (1 diff)
• LICENSE (modified) (1 diff)
• zoo-kernel/service_internal_ms.c (modified) (10 diffs)

trunk/zoo-project/HISTORY.txt

@@ -2 +2 @@
   * Fix POST Request issue (ticket #34)
   * Fix COOKIE gesture (ticket #79)
+  * Remove verbose messages when using MapServer W*S (ticket #80)
+  * Add COMMITTERS  and LICENSE files
 
 Version 1.3.0-rc1

trunk/zoo-project/LICENSE

@@ -10 +10 @@
 
 Copyright (c) 2009-2013 GeoLabs SARL
+Copyright 2010-2011 Fondazione Edmund Mach. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 

trunk/zoo-project/zoo-kernel/service_internal_ms.c

@@ -118 +118 @@
   char options[3][5][25]={
     {"WMS","1.3.0","GetMap","layers=%s","wms_extent"},
-    {"WFS","1.1.0","GetFeature","typename=%s","wms_extent"},
+    {"WFS","1.1.0","GetFeature","typename=%s","wcs_extent"},
     {"WCS","1.1.0","GetCoverage","coverage=%s","wcs_extent"}
   };
@@ -328 +328 @@
       sprintf(tmpExtent,"%.3f,%.3f,%.3f,%.3f",min.y,min.x,max.y,max.x);
       map* isGeo=getMap(output->content,"crs_isGeographic");
+#ifdef DEBUGMS
       fprintf(stderr,"isGeo = %s\n",isGeo->value);
+#endif
       if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
         sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
@@ -338 +340 @@
       map* isGeo=getMap(output->content,"crs_isGeographic");
       if(isGeo!=NULL){
+#ifdef DEBUGMS
         fprintf(stderr,"isGeo = %s\n",isGeo->value);
+#endif
         if(isGeo!=NULL && strcasecmp("true",isGeo->value)==0)
           sprintf(tmpExtent,"%f,%f,%f,%f", minY,minX, maxY, maxX);
@@ -396 +400 @@
   fclose(fileZ);
   free(buffer);
+#ifdef DEBUGMS
   fprintf(stderr,"Try loading %s",dsName);
+#endif
   poDS1 = OGROpen( dsName, FALSE, poDriver1 );
   if( poDS1 == NULL ){
@@ -403 +409 @@
     OGR_DS_Destroy(poDS1);
   }else{
+#ifdef DEBUGMS
     fprintf(stderr,"The DataSource is a  ZIP File\n");
+#endif
     char** demo=VSIReadDir(dsName);
     int i=0;
@@ -412 +420 @@
                 );
     while(demo[i]!=NULL){
+#ifdef DEBUGMS
       fprintf(stderr,"ZIP File content : %s\n",demo[i]);
+#endif
       char *tmpDs=(char*)malloc((strlen(dsName)+strlen(demo[i])+2)*sizeof(char));
       sprintf(tmpDs,"%s/%s",dsName,demo[i]);
@@ -418 +428 @@
       
       VSILFILE* vsif=VSIFOpenL(tmpDs,"rb");
+#ifdef DEBUGMS
       fprintf(stderr,"open : %s\n",tmpDs);
+#endif
       VSIFSeekL(vsif,0,SEEK_END);
       int size=VSIFTellL(vsif);
+#ifdef DEBUGMS
       fprintf(stderr,"size : %d\n",size);
+#endif
       VSIFSeekL(vsif,0,SEEK_SET);
       char *vsifcontent=(char*) malloc((size+1)*sizeof(char));
@@ -435 +449 @@
         tmpP=strstr(fpath,".SHP");
       if(tmpP!=NULL){
+#ifdef DEBUGMS
         fprintf(stderr,"*** DEBUG %s\n",strstr(tmpP,"."));
+#endif
         if( strcmp(tmpP,".shp")==0 || strcmp(tmpP,".SHP")==0 ){
           tmpMap=getMap(output->content,"storage");
@@ -442 +458 @@
           sprintf(tmpMap->value,"%s",fpath);
           pszDataSource=tmpMap->value;
+#ifdef DEBUGMS
           fprintf(stderr,"*** DEBUG %s\n",pszDataSource);
+#endif
         }
       }
@@ -490 +508 @@
 
     layerObj* myLayer=m->layers[m->numlayers];
+#ifdef DEBUGMS
     dumpMaps(output);
+#endif
     myLayer->name = strdup(output->name);
     myLayer->tileitem=NULL;