Migrate expression usage in server

m-kuhn · m-kuhn · commit e02cd570a6fe · 2017-05-19T07:13:11.000+02:00
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
@@ -109,27 +109,28 @@ INCLUDE_DIRECTORIES(SYSTEM
   ${QTKEYCHAIN_INCLUDE_DIR}
 )
 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/gui
   ${CMAKE_BINARY_DIR}/src/python
   ${CMAKE_BINARY_DIR}/src/analysis
   ${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})
diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp
@@ -32,6 +32,7 @@
 #include "qgslogger.h"
 #include "qgseditorwidgetsetup.h"
 #include "qgsgui.h"
+#include "qgsexpressionnodeimpl.h"
 
 #include <QDomDocument>
 #include <QFileInfo>
@@ -737,7 +738,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement &layerElem, QD
     QgsExpression exp( vLayer->displayExpression() );
     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 );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`#include "qgslogger.h"`
`33`	`33`	`#include "qgseditorwidgetsetup.h"`
`34`	`34`	`#include "qgsgui.h"`
	`35`	`+#include "qgsexpressionnodeimpl.h"`
`35`	`36`
`36`	`37`	`#include <QDomDocument>`
`37`	`38`	`#include <QFileInfo>`
`@@ -737,7 +738,7 @@ void QgsServerProjectParser::addLayerProjectSettings( QDomElement &layerElem, QD`
`737`	`738`	`QgsExpression exp( vLayer->displayExpression() );`
`738`	`739`	`if ( exp.isField() )`
`739`	`740`	`{`
`740`		`- displayField = static_cast<const QgsExpression::NodeColumnRef *>( exp.rootNode() )->name();`
	`741`	`+ displayField = static_cast<const QgsExpressionNodeColumnRef *>( exp.rootNode() )->name();`
`741`	`742`	`displayFieldIdx = vLayer->fields().lookupField( displayField );`
`742`	`743`	`}`
`743`	`744`