[mapserver-commits] r9441 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2009-10-12 00:59:46 -0400 (Mon, 12 Oct 2009)
New Revision: 9441

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapfile.c
Log:
Allow unquoted TEMPLATE keyword for a DRIVER in an OUTPUTFORMAT block.

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-11 21:27:28 UTC (rev 9440)
+++ trunk/mapserver/HISTORY.TXT	2009-10-12 04:59:46 UTC (rev 9441)
@@ -15,6 +15,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Allow "DRIVER 'TEMPLATE'" or "DRIVER TEMPLATE" in output formats
+
 - Correct sld generated from mapserver classes (#3133) 
 
 - Correct libjpeg v7 compatability issue in old jpeg interface code (#3167)

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2009-10-11 21:27:28 UTC (rev 9440)
+++ trunk/mapserver/mapfile.c	2009-10-12 04:59:46 UTC (rev 9441)
@@ -3761,7 +3761,14 @@
       if(getString(&mimetype) == MS_FAILURE) return(-1);
       break;
     case(DRIVER):
-      if(getString(&driver) == MS_FAILURE) return(-1);
+      {
+        int s;
+        if((s = getSymbol(2, MS_STRING, TEMPLATE)) == -1) return -1; /* allow the template to be quoted or not in the mapfile */
+        if(s == MS_STRING)
+          driver = strdup(msyytext);
+        else
+          driver = strdup("TEMPLATE");
+      }
       break;
     case(EXTENSION):
       if(getString(&extension) == MS_FAILURE) return(-1);