[mapserver-commits] r12799 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2011-11-23 10:42:13 -0800 (Wed, 23 Nov 2011)
New Revision: 12799

Modified:
   trunk/mapserver/mapogcfilter.c
Log:
correct wms dimension setting for postgis layers (#3466)

Modified: trunk/mapserver/mapogcfilter.c
===================================================================
--- trunk/mapserver/mapogcfilter.c	2011-11-23 16:26:33 UTC (rev 12798)
+++ trunk/mapserver/mapogcfilter.c	2011-11-23 18:42:13 UTC (rev 12799)
@@ -325,7 +325,12 @@
 			  pszTmpExpression = msStringConcatenate(pszTmpExpression, "\"");
 		    }
 		    if (bIscharacter)
-		      pszTmpExpression = msStringConcatenate(pszTmpExpression, " = \"");
+		    {
+		       if (bSqlLayer)
+			 pszTmpExpression = msStringConcatenate(pszTmpExpression, " = '");
+		       else
+			 pszTmpExpression = msStringConcatenate(pszTmpExpression, " = \"");
+		    }
 		    else
 		      pszTmpExpression = msStringConcatenate(pszTmpExpression, " = ");
 			 
@@ -333,8 +338,12 @@
 		    pszTmpExpression = msStringConcatenate(pszTmpExpression, pszEscapedStr);
 			 
 		    if (bIscharacter)
-		      pszTmpExpression = msStringConcatenate(pszTmpExpression, "\"");
-			 
+		    {
+			if (bSqlLayer)
+			  pszTmpExpression = msStringConcatenate(pszTmpExpression, "'");
+			else
+			  pszTmpExpression = msStringConcatenate(pszTmpExpression, "\"");
+		    }	 
 		    pszTmpExpression = msStringConcatenate(pszTmpExpression, ")");
 
 		    msFree(pszEscapedStr);