[mapserver-commits] r7611 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-05-22 00:29:46 -0400 (Thu, 22 May 2008)
New Revision: 7611

Modified:
   trunk/mapserver/maptemplate.c
   trunk/mapserver/maptemplate.h
Log:
Added option (sendheaders) to mapservObj to allow for the supression of CGI headers. (#2594)

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2008-05-21 19:19:27 UTC (rev 7610)
+++ trunk/mapserver/maptemplate.c	2008-05-22 04:29:46 UTC (rev 7611)
@@ -3562,6 +3562,8 @@
   mapserv->savemap=MS_FALSE;
   mapserv->savequery=MS_FALSE; /* should the query and/or map be saved  */
 
+  mapserv->sendheaders = MS_TRUE;
+
   mapserv->request = msAllocCgiObj();
 
   mapserv->map=NULL;

Modified: trunk/mapserver/maptemplate.h
===================================================================
--- trunk/mapserver/maptemplate.h	2008-05-21 19:19:27 UTC (rev 7610)
+++ trunk/mapserver/maptemplate.h	2008-05-22 04:29:46 UTC (rev 7611)
@@ -48,8 +48,8 @@
             INDEXQUERY, INDEXQUERYMAP, TILE, OWS};
 
 
-/*! \srtuct mapservObj
- *  \brief Global structur used by template and mapserv
+/* struct mapservObj
+ * Global structure used by templates and mapserver CGI interface.
  * 
  * This structur was created to seperate template functionality
  * from the main mapserv file. Instead of moving all template
@@ -59,71 +59,61 @@
 */
 typedef struct
 {
-   /* should the query and/or map be saved */
-   int savemap, savequery;
+  /* should the query and/or map be saved */
+  int savemap, savequery;
 
-   cgiRequestObj *request;
+  cgiRequestObj *request;
 
-   mapObj *map;
+  int sendheaders; /* should mime-type header be output, default will be MS_TRUE */
 
-   char **Layers;
-   char *icon; /* layer:class combination that defines a legend icon */
-  
-   /* number of layers specfied by a use */
-   int NumLayers;
-   /* Allocated size of Layers[] array */
-   int MaxLayers;
+  mapObj *map;
 
-   layerObj *resultlayer;
+  char **Layers;
+  char *icon; /* layer:class combination that defines a legend icon */
+    
+  int NumLayers; /* number of layers specfied by a use */
+  int MaxLayers; /* Allocated size of Layers[] array */
+
+  layerObj *resultlayer;
    
-   int UseShapes; /* are results of a query to be used in calculating an extent of some sort */
+  int UseShapes; /* are results of a query to be used in calculating an extent of some sort */
 
+  shapeObj SelectShape, resultshape;
 
-   shapeObj SelectShape, resultshape;
+  rectObj RawExt;
 
-   rectObj RawExt;
+  pointObj mappnt;
+  
+  double fZoom, Zoom;     
+  int ZoomDirection; /* whether zooming in or out, default is pan or 0 */
 
-   pointObj mappnt;
-
-   /* default for browsing */
-   double fZoom, Zoom;
+  int Mode; /* can be BROWSE, QUERY, etc. */
    
-   /* whether zooming in or out, default is pan or 0 */
-   int ZoomDirection; 
-
-   /* can be BROWSE, QUERY, etc. */
-   int Mode; 
+  int TileMode; /* can be GMAP, VE */
+  char *TileCoords; /* for GMAP: 0 0 1; for VE: 013021023 */
    
-   /* can be GMAP, VE */
-   int TileMode;
-   /* for GMAP: 0 0 1; for VE: 013021023 */
-   char *TileCoords;
+  char Id[IDSIZE]; /* big enough for time + pid */
    
-   /* big enough for time + pid */
-   char Id[IDSIZE]; 
-   
-   int CoordSource;
-   double ScaleDenom; /* used to create a map extent around a point */
+  int CoordSource;
+  double ScaleDenom; /* used to create a map extent around a point */
 
-   int ImgRows, ImgCols;
-   rectObj ImgExt; /* Existing image's mapextent */
-   rectObj ImgBox;
+  int ImgRows, ImgCols;
+  rectObj ImgExt; /* Existing image's mapextent */
+  rectObj ImgBox;
    
-   pointObj RefPnt;
-   pointObj ImgPnt;
+  pointObj RefPnt;
+  pointObj ImgPnt;
 
-   double Buffer;
-
-
-   
-   /* 
-    ** variables for multiple query results processing 
-    */
-   int RN; /* overall result number */
-   int LRN; /* result number within a layer */
-   int NL; /* total number of layers with results */
-   int NR; /* total number or results */
-   int NLR; /* number of results in a layer */
+  double Buffer;
+ 
+  /* 
+  ** variables for multiple query results processing 
+  */
+  int RN; /* overall result number */
+  int LRN; /* result number within a layer */
+  int NL; /* total number of layers with results */
+  int NR; /* total number or results */
+  int NLR; /* number of results in a layer */
 } mapservObj;