Get pk attributes from layer instead of provider

mhugent · mhugent · commit 10cbad7769ff · 2019-01-05T15:16:38.000+01:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -395,14 +395,8 @@ namespace QgsWms
         throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
                                       QStringLiteral( "The atlas has no coverage layer" ) );
       }
-      QgsVectorDataProvider *cProvider = cLayer->dataProvider();
-      if ( !cProvider )
-      {
-        throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
-                                      QStringLiteral( "An error occured during the Atlas print" ) );
-      }
 
-      QgsAttributeList pkIndexes = cProvider->pkAttributeIndexes();
+      QgsAttributeList pkIndexes = cLayer->primaryKeyAttributes();
       if ( pkIndexes.size() < 1 )
       {
         throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),
@@ -411,7 +405,7 @@ namespace QgsWms
       QStringList pkAttributeNames;
       for ( int i = 0; i < pkIndexes.size(); ++i )
       {
-        pkAttributeNames.append( cProvider->fields()[pkIndexes.at( i )].name() );
+        pkAttributeNames.append( cLayer->fields()[pkIndexes.at( i )].name() );
       }
 
       int nAtlasFeatures = atlasPk.size() / pkIndexes.size();

Original file line number	Diff line number	Diff line change
`@@ -395,14 +395,8 @@ namespace QgsWms`
`395`	`395`	`throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),`
`396`	`396`	`QStringLiteral( "The atlas has no coverage layer" ) );`
`397`	`397`	`}`
`398`		`- QgsVectorDataProvider *cProvider = cLayer->dataProvider();`
`399`		`- if ( !cProvider )`
`400`		`- {`
`401`		`- throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),`
`402`		`- QStringLiteral( "An error occured during the Atlas print" ) );`
`403`		`- }`
`404`	`398`
`405`		`- QgsAttributeList pkIndexes = cProvider->pkAttributeIndexes();`
	`399`	`+ QgsAttributeList pkIndexes = cLayer->primaryKeyAttributes();`
`406`	`400`	`if ( pkIndexes.size() < 1 )`
`407`	`401`	`{`
`408`	`402`	`throw QgsBadRequestException( QStringLiteral( "AtlasPrintError" ),`
`@@ -411,7 +405,7 @@ namespace QgsWms`
`411`	`405`	`QStringList pkAttributeNames;`
`412`	`406`	`for ( int i = 0; i < pkIndexes.size(); ++i )`
`413`	`407`	`{`
`414`		`- pkAttributeNames.append( cProvider->fields()[pkIndexes.at( i )].name() );`
	`408`	`+ pkAttributeNames.append( cLayer->fields()[pkIndexes.at( i )].name() );`
`415`	`409`	`}`
`416`	`410`
`417`	`411`	`int nAtlasFeatures = atlasPk.size() / pkIndexes.size();`