From 1d056de0e5e9d97a31f8181cc62f99c919dca768 Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sun, 21 Mar 2010 15:30:15 +0000
Subject: [PATCH] fix projections selection when CRSes from multiple
 authorities are preselected

git-svn-id: http://svn.osgeo.org/qgis/trunk@13134 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/gui/qgsprojectionselector.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp
index f94a9a840c3..9ff2c8e5494 100644
--- a/src/gui/qgsprojectionselector.cpp
+++ b/src/gui/qgsprojectionselector.cpp
@@ -251,10 +251,18 @@ QString QgsProjectionSelector::ogcWmsCrsFilterAsSqlExpression( QSet<QString> * c
   if ( authParts.isEmpty() )
     return sqlExpression;
 
-  foreach( QString auth_name, authParts.keys() )
+  if( authParts.size() > 0 )
   {
-    sqlExpression += QString( " AND (auth_name='%1' AND auth_id IN ('%2'))" )
-                     .arg( auth_name ).arg( authParts[auth_name].join( "','" ) );
+    QString prefix = " AND (";
+    foreach( QString auth_name, authParts.keys() )
+    {
+      sqlExpression += QString( "%1(auth_name='%2' AND auth_id IN ('%3'))" )
+                        .arg( prefix )
+                        .arg( auth_name )
+                        .arg( authParts[auth_name].join( "','" ) );
+      prefix = " OR ";
+    }
+    sqlExpression += ")";
   }
 
   QgsDebugMsg( "exiting with '" + sqlExpression + "'." );