sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-06 00:03:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Migrate expression usage in server

Browse Source
This commit is contained in:
Matthias Kuhn 2017-05-16 08:02:52 +02:00
parent 9b77006592
commit e02cd570a6
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/server/CMakeLists.txt
View File

@ -109,27 +109,28 @@ INCLUDE_DIRECTORIES(SYSTEM
${QTKEYCHAIN_INCLUDE_DIR} ${QTKEYCHAIN_INCLUDE_DIR}
) )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/auth
${CMAKE_SOURCE_DIR}/src/core/dxf
${CMAKE_SOURCE_DIR}/src/core/expression
${CMAKE_SOURCE_DIR}/src/core/geometry
${CMAKE_SOURCE_DIR}/src/core/metadata
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/layertree
${CMAKE_SOURCE_DIR}/src/gui
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets
${CMAKE_SOURCE_DIR}/src/gui/editorwidgets/core
${CMAKE_SOURCE_DIR}/src/analysis/interpolation
${CMAKE_SOURCE_DIR}/src/plugins/diagram_overlay
${CMAKE_SOURCE_DIR}/src/python
${CMAKE_BINARY_DIR}/src/core ${CMAKE_BINARY_DIR}/src/core
${CMAKE_BINARY_DIR}/src/gui ${CMAKE_BINARY_DIR}/src/gui
${CMAKE_BINARY_DIR}/src/python ${CMAKE_BINARY_DIR}/src/python
${CMAKE_BINARY_DIR}/src/analysis ${CMAKE_BINARY_DIR}/src/analysis
${CMAKE_BINARY_DIR}/src/server ${CMAKE_BINARY_DIR}/src/server
../core
../core/auth
../core/dxf
../core/geometry
../core/metadata
../core/raster
../core/symbology-ng
../core/composer
../core/layertree
../gui
../gui/editorwidgets
../gui/editorwidgets/core
../analysis/interpolation
../plugins/diagram_overlay
../python
.
) )
ADD_LIBRARY(qgis_server SHARED ${qgis_mapserv_SRCS} ${qgis_mapserv_MOC_SRCS} ${qgis_mapserv_HDRS} ${qgis_mapserv_MOC_HDRS}) ADD_LIBRARY(qgis_server SHARED ${qgis_mapserv_SRCS} ${qgis_mapserv_MOC_SRCS} ${qgis_mapserv_HDRS} ${qgis_mapserv_MOC_HDRS})

3
src/server/qgsserverprojectparser.cpp
View File

@ -32,6 +32,7 @@
#include "qgslogger.h" #include "qgslogger.h"
#include "qgseditorwidgetsetup.h" #include "qgseditorwidgetsetup.h"
#include "qgsgui.h" #include "qgsgui.h"
#include "qgsexpressionnodeimpl.h"
#include <QDomDocument> #include <QDomDocument>
#include <QFileInfo> #include <QFileInfo>
@ -737,7 +738,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement &layerElem, QD
QgsExpression exp( vLayer->displayExpression() ); QgsExpression exp( vLayer->displayExpression() );
if ( exp.isField() ) if ( exp.isField() )
{ {
displayField = static_cast<const QgsExpression::NodeColumnRef *>( exp.rootNode() )->name(); displayField = static_cast<const QgsExpressionNodeColumnRef *>( exp.rootNode() )->name();
displayFieldIdx = vLayer->fields().lookupField( displayField ); displayFieldIdx = vLayer->fields().lookupField( displayField );
} }