Skip to content

Commit a80497e

Browse files
dmarteaudmarteau
committedJan 18, 2017
Clean WMS service
 - Remove "transitional" code - Remove duplicated code (or functionaly equivalent code) - Remove dead code - Sanitize error checking - Ensure correct build with HAVE_SERVER_PYTHON_PLUGINS not defined
·
ltr-3_40final-3_0_0
1 parent d0a4697 commit a80497e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1118
-1199
lines changed
 

‎src/server/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ SET ( qgis_mapserv_SRCS
5252
qgsfcgiserverresponse.cpp
5353
qgsbufferserverresponse.cpp
5454
qgsfilterresponsedecorator.cpp
55+
qgsserverinterface.cpp
56+
qgsserverinterfaceimpl.cpp
5557
qgsfilterrestorer.cpp
5658
#----------------------------
5759
)
@@ -98,11 +100,9 @@ SET(qgis_mapserv_MOC_HDRS ${qgis_mapserv_MOC_HDRS})
98100
IF (WITH_SERVER_PLUGINS)
99101
SET(qgis_mapserv_SRCS ${qgis_mapserv_SRCS}
100102
qgsserverplugins.cpp
101-
qgsserverinterface.cpp
102103
qgsserverfilter.cpp
103104
qgsaccesscontrolfilter.cpp
104105
qgsaccesscontrol.cpp
105-
qgsserverinterfaceimpl.cpp
106106
)
107107
ENDIF (WITH_SERVER_PLUGINS)
108108

‎src/server/qgsconfigcache.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,7 @@ QgsServerProjectParser* QgsConfigCache::serverConfiguration( const QString& file
7979

8080
QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
8181
const QString& filePath
82-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
8382
, const QgsAccessControl* accessControl
84-
#endif
8583
)
8684
{
8785
QgsWCSProjectParser *p = mWCSConfigCache.object( filePath );
@@ -94,9 +92,7 @@ QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
9492
}
9593
p = new QgsWCSProjectParser(
9694
filePath
97-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
9895
, accessControl
99-
#endif
10096
);
10197
mWCSConfigCache.insert( filePath, p );
10298
p = mWCSConfigCache.object( filePath );
@@ -109,9 +105,7 @@ QgsWCSProjectParser *QgsConfigCache::wcsConfiguration(
109105

110106
QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
111107
const QString& filePath
112-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
113108
, const QgsAccessControl* accessControl
114-
#endif
115109
)
116110
{
117111
QgsWfsProjectParser *p = mWFSConfigCache.object( filePath );
@@ -124,9 +118,7 @@ QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
124118
}
125119
p = new QgsWfsProjectParser(
126120
filePath
127-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
128121
, accessControl
129-
#endif
130122
);
131123
mWFSConfigCache.insert( filePath, p );
132124
p = mWFSConfigCache.object( filePath );
@@ -139,9 +131,7 @@ QgsWfsProjectParser *QgsConfigCache::wfsConfiguration(
139131

140132
QgsWmsConfigParser *QgsConfigCache::wmsConfiguration(
141133
const QString& filePath
142-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
143134
, const QgsAccessControl* accessControl
144-
#endif
145135
, const QMap<QString, QString>& parameterMap
146136
)
147137
{
@@ -165,9 +155,7 @@ QgsWmsConfigParser *QgsConfigCache::wmsConfiguration(
165155
{
166156
p = new QgsWmsProjectParser(
167157
filePath
168-
#ifdef HAVE_SERVER_PYTHON_PLUGINS
169158
, accessControl
170-
#endif
171159
);
172160
}
173161
mWMSConfigCache.insert( filePath, p );

0 commit comments

Comments
 (0)
Please sign in to comment.