Merge pull request #3781 from mhugent/wms_project_variables

mhugent · web-flow · commit 339986dfae3f · 2016-11-18T11:33:03.000+01:00
Set project expression variables in server
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -80,6 +80,17 @@ QgsServerProjectParser::QgsServerProjectParser( QDomDocument* xmlDoc, const QStr
   {
     QgsProject::instance()->setFileName( mProjectPath );
   }
+
+  // Set the project scope variables
+  QStringList variableNames = readListEntry( "Variables", "variableNames" );
+  QStringList variableValues = readListEntry( "Variables", "variableValues" );
+
+  //read values
+
+  //append standard values
+
+  QgsProject::instance()->writeEntry( "Variables", "/variableNames", variableNames );
+  QgsProject::instance()->writeEntry( "Variables", "/variableValues", variableValues );
 }
 
 QgsServerProjectParser::QgsServerProjectParser()
@@ -1612,4 +1623,34 @@ void QgsServerProjectParser::addGetFeatureLayers( const QDomElement& layerElem )
   }
 }
 
+QStringList QgsServerProjectParser::readListEntry( const QString& scope, const QString& key ) const
+{
+  QStringList entryList;
+  QDomElement propertiesElement = propertiesElem();
+  if ( propertiesElement.isNull() )
+  {
+    return entryList;
+  }
+
+  QDomElement scopeElem = propertiesElement.firstChildElement( scope );
+  if ( scopeElem.isNull() )
+  {
+    return entryList;
+  }
+
+  QDomElement keyElem = scopeElem.firstChildElement( key );
+  if ( keyElem.isNull() )
+  {
+    return entryList;
+  }
+
+  QDomNodeList valueNodeList = keyElem.elementsByTagName( "value" );
+  for ( int i = 0; i < valueNodeList.size(); ++i )
+  {
+    entryList.append( valueNodeList.at( i ).toElement().text() );
+  }
+
+  return entryList;
+}
+
 
diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h
@@ -175,6 +175,9 @@ class SERVER_EXPORT QgsServerProjectParser
 
     /** Adds sublayers of an embedded group to layer set*/
     static void sublayersOfEmbeddedGroup( const QString& projectFilePath, const QString& groupName, QSet<QString>& layerSet );
+
+    /** Reads list entry from project properties*/
+    QStringList readListEntry( const QString& scope, const QString& key ) const;
 };
 
 #endif // QGSSERVERPROJECTPARSER_H
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -2079,6 +2079,15 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const
     mMapRenderer->setOutputUnits( QgsMapRenderer::Pixels ); //SLD units are in pixels normally
   }
 
+  //Clear expression context and set project variables
+  QgsRenderContext* ctx = mMapRenderer->rendererContext();
+  if ( ctx )
+  {
+    QgsExpressionContext newContext;
+    newContext.appendScope( QgsExpressionContextUtils::projectScope() );
+    ctx->setExpressionContext( newContext );
+  }
+
   return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2079,6 +2079,15 @@ int QgsWMSServer::configureMapRender( const QPaintDevice* paintDevice ) const`
`2079`	`2079`	`mMapRenderer->setOutputUnits( QgsMapRenderer::Pixels ); //SLD units are in pixels normally`
`2080`	`2080`	`}`
`2081`	`2081`
	`2082`	`+ //Clear expression context and set project variables`
	`2083`	`+ QgsRenderContext* ctx = mMapRenderer->rendererContext();`
	`2084`	`+ if ( ctx )`
	`2085`	`+ {`
	`2086`	`+ QgsExpressionContext newContext;`
	`2087`	`+ newContext.appendScope( QgsExpressionContextUtils::projectScope() );`
	`2088`	`+ ctx->setExpressionContext( newContext );`
	`2089`	`+ }`
	`2090`	`+`
`2082`	`2091`	`return 0;`
`2083`	`2092`	`}`
`2084`	`2093`