[mapserver-commits] r11666 - trunk/mapserver

[svn at osgeo.org]

Author: tamas
Date: 2011-05-10 05:52:09 -0700 (Tue, 10 May 2011)
New Revision: 11666

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapcluster.c
Log:
Cluster layer: Fixed the problem when returning undefined attribute (#3700)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2011-05-09 21:41:58 UTC (rev 11665)
+++ trunk/mapserver/HISTORY.TXT	2011-05-10 12:52:09 UTC (rev 11666)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk): 
 ---------------------------- 
 
+- Cluster layer: Fixed the problem when returning undefined attribute (#3700)
+
 - Union layer: Fix for the item initialization at the source layer (#3859)
 
 - Union layer: Fixed the potential seg fault when STYLEITEM AUTO is used (#3859)

Modified: trunk/mapserver/mapcluster.c
===================================================================
--- trunk/mapserver/mapcluster.c	2011-05-09 21:41:58 UTC (rev 11665)
+++ trunk/mapserver/mapcluster.c	2011-05-10 12:52:09 UTC (rev 11666)
@@ -582,6 +582,13 @@
                 msFree(base->shape.values[i]);
                 base->shape.values[i] = msIntToString(count);
             }
+            else if (!EQUAL(base->shape.values[i], current->shape.values[i]) 
+                     && !EQUAL(base->shape.values[i], ""))
+            {
+                /* clear the value if that doesn't match */
+                msFree(base->shape.values[i]);
+                base->shape.values[i] = msStrdup("");
+            }
         }
     }
 }