[mapserver-commits] r7446 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-03-11 14:01:04 -0400 (Tue, 11 Mar 2008)
New Revision: 7446

Modified:
   trunk/mapserver/maptemplate.c
   trunk/mapserver/maptemplate.h
Log:
Added an icon element to the mapservObj.

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2008-03-11 17:32:56 UTC (rev 7445)
+++ trunk/mapserver/maptemplate.c	2008-03-11 18:01:04 UTC (rev 7446)
@@ -862,11 +862,11 @@
       return(MS_FAILURE);
     }
 
-    for(i=0; i<layer->numitems; i++)
+    for(i=0; i<layer->numitems; i++)			
       if(strcasecmp(name, layer->items[i]) == 0) break;
 
     if(i == layer->numitems) {
-      msSetError(MS_WEBERR, "Item name not found in layer item list.", "processItem()");
+      msSetError(MS_WEBERR, "Item name (%s) not found in layer item list.", "processItem()", name);
       return(MS_FAILURE);
     }    
 
@@ -3339,6 +3339,8 @@
   mapserv->MaxLayers=0; /* allocated size of Layers[] array */
   mapserv->Layers = NULL;
 
+  mapserv->icon = NULL;
+
   mapserv->RawExt.minx=-1;
   mapserv->RawExt.miny=-1;
   mapserv->RawExt.maxx=-1;
@@ -3409,6 +3411,8 @@
       msFree(mapserv->Layers[i]);
     msFree(mapserv->Layers);
 
+    msFree(mapserv->icon);
+
     msFree(mapserv);
   }
 }

Modified: trunk/mapserver/maptemplate.h
===================================================================
--- trunk/mapserver/maptemplate.h	2008-03-11 17:32:56 UTC (rev 7445)
+++ trunk/mapserver/maptemplate.h	2008-03-11 18:01:04 UTC (rev 7446)
@@ -61,12 +61,13 @@
    /* should the query and/or map be saved */
    int SaveMap, SaveQuery;
 
-  cgiRequestObj *request;
+   cgiRequestObj *request;
 
    mapObj *Map;
 
    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 */