Fix for filtering in qgis server

qgis · Jun 24, 2011 · 8910039 · 8910039
1 parent 44bfb2d
commit 8910039
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -1524,31 +1524,34 @@ QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringLi
                                       "AND,OR,IN,<,>=,>,>=,!=,',',(,). Not allowed are semicolons in the filter expression." );
       }
 
-      //we know the layer name, but need to go through the list because a layer could be there several times...
+      //we need to find the maplayer objects matching the layer name
-      int listPos = 1;
+      QList<QgsMapLayer*> layersToFilter;
-      QStringList::const_iterator layerIt = layerList.constBegin();
+      QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();
-      for ( ; layerIt != layerList.constEnd(); ++layerIt )
+
+      QMap<QString, QgsMapLayer*>::iterator layerIt = layerMap.begin();
+      for ( ; layerIt != layerMap.end(); ++layerIt )
+      {
+        if ( layerIt.value() && layerIt.value()->name() == eqSplit.at( 0 ) )
+        {
+          layersToFilter.push_back( layerIt.value() );
+        }
+      }
+
+      QList<QgsMapLayer*>::iterator filterIt = layersToFilter.begin();
+      for ( ; filterIt != layersToFilter.end(); ++filterIt )
       {
-        if ( *layerIt == eqSplit.at( 0 ) )
+        QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( *filterIt );
+        if ( filteredLayer )
         {
-          QString layerId = layerIds.at( layerIds.size() - listPos );
+          filterMap.insert( filteredLayer->id(), filteredLayer->subsetString() );
-          QgsVectorLayer* filteredLayer = dynamic_cast<QgsVectorLayer*>( QgsMapLayerRegistry::instance()->mapLayer( layerId ) );
+          QString newSubsetString = eqSplit.at( 1 );
-          if ( filteredLayer )
+          if ( !filteredLayer->subsetString().isEmpty() )
           {
-            if ( filteredLayer )
+            newSubsetString.prepend( " AND " );
-            {
+            newSubsetString.prepend( filteredLayer->subsetString() );
-              filterMap.insert( layerId, filteredLayer->subsetString() );
-              QString newSubsetString = eqSplit.at( 1 );
-              if ( !filteredLayer->subsetString().isEmpty() )
-              {
-                newSubsetString.prepend( " AND " );
-                newSubsetString.prepend( filteredLayer->subsetString() );
-              }
-              filteredLayer->setSubsetString( newSubsetString );
-            }
           }
+          filteredLayer->setSubsetString( newSubsetString );
         }
-        ++listPos;
       }
     }