[mapserver-commits] r7584 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-05-12 18:28:17 -0400 (Mon, 12 May 2008)
New Revision: 7584

Modified:
   trunk/mapserver/maptemplate.c
Log:
Resultset tag now recognizes feature tags. (RFC 36)

Modified: trunk/mapserver/maptemplate.c
===================================================================
--- trunk/mapserver/maptemplate.c	2008-05-12 20:34:12 UTC (rev 7583)
+++ trunk/mapserver/maptemplate.c	2008-05-12 22:28:17 UTC (rev 7584)
@@ -967,6 +967,8 @@
     }
   }
 
+  *line = processLine(mapserv, *line, NULL, BROWSE); /* do substitutions, non-query tags only yet */
+
   if(getInlineTag("resultset", *line, &tag) != MS_SUCCESS) {
     msSetError(MS_WEBERR, "Malformed resultset tag.", "processResultSetTag()");
     return MS_FAILURE;
@@ -978,8 +980,10 @@
   /* start rebuilding **line */
   free(*line); *line = preTag;
 
-  if(lp->resultcache && lp->resultcache->numresults > 0) {
-    /* output the tag content */
+  if(lp->resultcache && lp->resultcache->numresults > 0) {    
+    /* probably will need a while-loop here to handle multiple instances of [feature ...] tags */
+    if(processFeatureTag(mapserv, &tag, lp) != MS_SUCCESS)
+      return(MS_FAILURE); /* TODO: how to handle */ 
     *line = msStringConcatenate(*line, tag);
   }