[mapserver-commits] r10106 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2010-04-20 00:19:06 -0400 (Tue, 20 Apr 2010)
New Revision: 10106

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maplayer.c
Log:
Cleaned up some really long comments (result of cut & paste) and updated HISTORY.TXT.)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-15 12:17:13 UTC (rev 10105)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-04-20 04:19:06 UTC (rev 10106)
@@ -14,6 +14,9 @@
 
 Version 5.6.4 (????-??-??):
 ---------------------------
+
+- Reverted msLayerWhichItems() to 5.4-like behavior although still supporting 
+  retrieving all items (#3356,#3342)
  
 - Grid layer: remove drawing of unnecessary gird lines (#3433) 
 

Modified: branches/branch-5-6/mapserver/maplayer.c
===================================================================
--- branches/branch-5-6/mapserver/maplayer.c	2010-04-15 12:17:13 UTC (rev 10105)
+++ branches/branch-5-6/mapserver/maplayer.c	2010-04-20 04:19:06 UTC (rev 10106)
@@ -352,10 +352,10 @@
   }
 }
 
-/*                                                                                                                                                                                                                                        
-** This function builds a list of items necessary to draw or query a particular layer by                                                                                                                                                  
-** examining the contents of the various xxxxitem parameters and expressions. That list is                                                                                                                                                
-** then used to set the iteminfo variable.                                                                                                                                                                                                
+/*
+** This function builds a list of items necessary to draw or query a particular layer by
+** examining the contents of the various xxxxitem parameters and expressions. That list is
+** then used to set the iteminfo variable.
 */
 int msLayerWhichItems(layerObj *layer, int get_all, char *metadata)
 {
@@ -367,7 +367,7 @@
     if (rv != MS_SUCCESS) return rv;
   }
 
-  /* Cleanup any previous item selection */
+  /* cleanup any previous item selection */
   msLayerFreeItemInfo(layer);
   if(layer->items) {
     msFreeCharArray(layer->items, layer->numitems);
@@ -375,9 +375,7 @@
     layer->numitems = 0;
   }
 
-  /*                                                                                                                                                                                                                                      
-  ** layer level counts                                                                                                                                                                                                                   
-  */
+  /* layer level counts */
   if(layer->classitem) nt++;
   if(layer->filteritem) nt++;
 
@@ -402,9 +400,7 @@
 
   if(layer->labelitem) nt++;
 
-  /*                                                                                                                                                                                                                                        
-  ** class level counts                                                                                                                                                                                                                     
-  */
+  /* class level counts */
   for(i=0; i<layer->numclasses; i++) {
 
     for(j=0; j<layer->class[i]->numstyles; j++) {
@@ -453,7 +449,7 @@
     }
   }
 
-  /* Always retrieve all items in some cases */
+  /* always retrieve all items in some cases */
   if(layer->connectiontype == MS_INLINE || get_all == MS_TRUE) {
     msLayerGetItems(layer);
     if(nt > 0) /* need to realloc the array to accept the possible new items*/