[mapserver-commits] r13103 - branches/branch-6-0/mapserver

[svn at osgeo.org]

Author: pramsey
Date: 2012-02-08 15:19:13 -0800 (Wed, 08 Feb 2012)
New Revision: 13103

Modified:
   branches/branch-6-0/mapserver/mappostgis.c
Log:
Use ST_ function prefix for PostGIS 2.0 support


Modified: branches/branch-6-0/mapserver/mappostgis.c
===================================================================
--- branches/branch-6-0/mapserver/mappostgis.c	2012-02-08 23:18:56 UTC (rev 13102)
+++ branches/branch-6-0/mapserver/mappostgis.c	2012-02-08 23:19:13 UTC (rev 13103)
@@ -1533,7 +1533,7 @@
     }
 
     if ( strSRID ) {
-        static char *strBoxTemplate = "GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
+        static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))',%s)";
         /* 10 doubles + 1 integer + template characters */
         sz = 10 * 22 + strlen(strSRID) + strlen(strBoxTemplate);
         strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */
@@ -1549,7 +1549,7 @@
                 return NULL;
             }
         } else {
-            static char *strBoxTemplate = "GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
+            static char *strBoxTemplate = "ST_GeomFromText('POLYGON((%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g,%.15g %.15g))')";
             /* 10 doubles + template characters */
             sz = 10 * 22 + strlen(strBoxTemplate);
             strBox = (char*)msSmallMalloc(sz+1); /* add space for terminating NULL */