[mapserver-commits] r8901 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2009-04-12 12:49:02 -0400 (Sun, 12 Apr 2009)
New Revision: 8901

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/maplayer.c
   branches/branch-5-4/mapserver/maprasterquery.c
Log:
Prevent from changing the connection type to MS_RASTER when setConnectionType(MS_WMS) is used (#2908)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-04-11 08:56:50 UTC (rev 8900)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-04-12 16:49:02 UTC (rev 8901)
@@ -12,6 +12,9 @@
 Current Version
 ---------------
 
+- Prevent from changing the connection type to MS_RASTER when setConnectionType(MS_WMS) is used (#2908)
+
+
 Version 5.4.0-rc1 (2009-04-08):
 -------------------------------
 

Modified: branches/branch-5-4/mapserver/maplayer.c
===================================================================
--- branches/branch-5-4/mapserver/maplayer.c	2009-04-11 08:56:50 UTC (rev 8900)
+++ branches/branch-5-4/mapserver/maplayer.c	2009-04-12 16:49:02 UTC (rev 8901)
@@ -77,7 +77,7 @@
   if(layer->tileindex && layer->connectiontype == MS_SHAPEFILE)
     layer->connectiontype = MS_TILED_SHAPEFILE;
 
-  if(layer->type == MS_LAYER_RASTER )
+  if(layer->type == MS_LAYER_RASTER && layer->connectiontype != MS_WMS)
     layer->connectiontype = MS_RASTER;
 
   if ( ! layer->vtable) {

Modified: branches/branch-5-4/mapserver/maprasterquery.c
===================================================================
--- branches/branch-5-4/mapserver/maprasterquery.c	2009-04-11 08:56:50 UTC (rev 8900)
+++ branches/branch-5-4/mapserver/maprasterquery.c	2009-04-12 16:49:02 UTC (rev 8901)
@@ -190,7 +190,8 @@
     /* We need to do this or the layer->layerinfo will be interpreted */
     /* as shapefile access info because the default connectiontype is */
     /* MS_SHAPEFILE. */
-    layer->connectiontype = MS_RASTER;
+    if (layer->connectiontype != MS_WMS)
+        layer->connectiontype = MS_RASTER;
 
     rlinfo->query_result_hard_max = 1000000;