Skip to content

Commit 3bb64a7

Browse files
rldhontrldhont
committed
[Server][Cache] Adding HAVE_SERVER_PYTHON_PLUGINS around accessControls and cacheManager methods
1 parent bc7cea2 commit 3bb64a7

10 files changed

+76
-26
lines changed

‎src/server/services/wcs/qgswcsdescribecoverage.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,17 @@ namespace QgsWcs
3636
void writeDescribeCoverage( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3737
const QgsServerRequest &request, QgsServerResponse &response )
3838
{
39-
QgsAccessControl *accessControl = serverIface->accessControls();
40-
39+
QgsAccessControl *accessControl = nullptr;
40+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
41+
accessControl = serverIface->accessControls();
42+
#endif
4143
QDomDocument doc;
4244
const QDomDocument *describeDocument = nullptr;
4345

44-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
46+
QgsServerCacheManager *cacheManager = nullptr;
47+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
48+
cacheManager = serverIface->cacheManager();
49+
#endif
4550
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
4651
{
4752
describeDocument = &doc;

‎src/server/services/wcs/qgswcsgetcapabilities.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,17 @@ namespace QgsWcs
3737
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
3838
const QgsServerRequest &request, QgsServerResponse &response )
3939
{
40-
QgsAccessControl *accessControl = serverIface->accessControls();
41-
40+
QgsAccessControl *accessControl = nullptr;
41+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
42+
accessControl = serverIface->accessControls();
43+
#endif
4244
QDomDocument doc;
4345
const QDomDocument *capabilitiesDocument = nullptr;
4446

45-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
47+
QgsServerCacheManager *cacheManager = nullptr;
48+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
49+
cacheManager = serverIface->cacheManager();
50+
#endif
4651
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
4752
{
4853
capabilitiesDocument = &doc;

‎src/server/services/wfs/qgswfsdescribefeaturetype.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,17 @@ namespace QgsWfs
4242
void writeDescribeFeatureType( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4343
const QgsServerRequest &request, QgsServerResponse &response )
4444
{
45-
QgsAccessControl *accessControl = serverIface->accessControls();
46-
45+
QgsAccessControl *accessControl = nullptr;
46+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
47+
accessControl = serverIface->accessControls();
48+
#endif
4749
QDomDocument doc;
4850
const QDomDocument *describeDocument = nullptr;
4951

50-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
52+
QgsServerCacheManager *cacheManager = nullptr;
53+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
54+
cacheManager = serverIface->cacheManager();
55+
#endif
5156
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5257
{
5358
describeDocument = &doc;

‎src/server/services/wfs/qgswfsgetcapabilities.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,17 @@ namespace QgsWfs
4141
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4242
const QgsServerRequest &request, QgsServerResponse &response )
4343
{
44-
QgsAccessControl *accessControl = serverIface->accessControls();
45-
44+
QgsAccessControl *accessControl = nullptr;
45+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
46+
accessControl = serverIface->accessControls();
47+
#endif
4648
QDomDocument doc;
4749
const QDomDocument *capabilitiesDocument = nullptr;
4850

49-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
51+
QgsServerCacheManager *cacheManager = nullptr;
52+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
53+
cacheManager = serverIface->cacheManager();
54+
#endif
5055
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5156
{
5257
capabilitiesDocument = &doc;

‎src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,17 @@ namespace QgsWfs
4343
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4444
const QgsServerRequest &request, QgsServerResponse &response )
4545
{
46-
QgsAccessControl *accessControl = serverIface->accessControls();
47-
46+
QgsAccessControl *accessControl = nullptr;
47+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
48+
accessControl = serverIface->accessControls();
49+
#endif
4850
QDomDocument doc;
4951
const QDomDocument *capabilitiesDocument = nullptr;
5052

51-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
53+
QgsServerCacheManager *cacheManager = nullptr;
54+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
55+
cacheManager = serverIface->cacheManager();
56+
#endif
5257
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5358
{
5459
capabilitiesDocument = &doc;

‎src/server/services/wms/qgswmsgetcapabilities.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ namespace QgsWms
9494
const QString &version, const QgsServerRequest &request,
9595
QgsServerResponse &response, bool projectSettings )
9696
{
97-
QgsAccessControl *accessControl = serverIface->accessControls();
97+
QgsAccessControl *accessControl = nullptr;
98+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
99+
accessControl = serverIface->accessControls();
100+
#endif
98101

99102
QDomDocument doc;
100103
const QDomDocument *capabilitiesDocument = nullptr;
@@ -110,7 +113,10 @@ namespace QgsWms
110113
cache = accessControl->fillCacheKey( cacheKeyList );
111114
QString cacheKey = cacheKeyList.join( '-' );
112115

113-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
116+
QgsServerCacheManager *cacheManager = nullptr;
117+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
118+
cacheManager = serverIface->cacheManager();
119+
#endif
114120
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
115121
{
116122
capabilitiesDocument = &doc;

‎src/server/services/wms/qgswmsgetcontext.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,18 @@ namespace QgsWms
5555
const QString &version, const QgsServerRequest &request,
5656
QgsServerResponse &response )
5757
{
58-
QgsAccessControl *accessControl = serverIface->accessControls();
58+
QgsAccessControl *accessControl = nullptr;
59+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
60+
accessControl = serverIface->accessControls();
61+
#endif
5962

6063
QDomDocument doc;
6164
const QDomDocument *contextDocument = nullptr;
6265

63-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
66+
QgsServerCacheManager *cacheManager = nullptr;
67+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
68+
cacheManager = serverIface->cacheManager();
69+
#endif
6470
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
6571
{
6672
contextDocument = &doc;

‎src/server/services/wms/qgswmsgetlegendgraphics.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,12 @@ namespace QgsWms
3939
QgsWmsParameters wmsParameters( QUrlQuery( request.url() ) );
4040

4141
// Get cached image
42-
QgsAccessControl *accessControl = serverIface->accessControls();
43-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
42+
QgsAccessControl *accessControl = nullptr;
43+
QgsServerCacheManager *cacheManager = nullptr;
44+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
45+
accessControl = serverIface->accessControls();
46+
cacheManager = serverIface->cacheManager();
47+
#endif
4448
if ( cacheManager )
4549
{
4650
ImageOutputFormat outputFormat = parseImageFormat( format );

‎src/server/services/wmts/qgswmtsgetcapabilities.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,17 @@ namespace QgsWmts
4646
void writeGetCapabilities( QgsServerInterface *serverIface, const QgsProject *project, const QString &version,
4747
const QgsServerRequest &request, QgsServerResponse &response )
4848
{
49-
QgsAccessControl *accessControl = serverIface->accessControls();
50-
49+
QgsAccessControl *accessControl = nullptr;
50+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
51+
accessControl = serverIface->accessControls();
52+
#endif
5153
QDomDocument doc;
5254
const QDomDocument *capabilitiesDocument = nullptr;
5355

54-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
56+
QgsServerCacheManager *cacheManager = nullptr;
57+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
58+
cacheManager = serverIface->cacheManager();
59+
#endif
5560
if ( cacheManager && cacheManager->getCachedDocument( &doc, project, request, accessControl ) )
5661
{
5762
capabilitiesDocument = &doc;

‎src/server/services/wmts/qgswmtsgettile.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@ namespace QgsWmts
3434
QUrlQuery query = translateWmtsParamToWmsQueryItem( QStringLiteral( "GetMap" ), params, project, serverIface );
3535

3636
// Get cached image
37-
QgsAccessControl *accessControl = serverIface->accessControls();
38-
QgsServerCacheManager *cacheManager = serverIface->cacheManager();
37+
QgsAccessControl *accessControl = nullptr;
38+
QgsServerCacheManager *cacheManager = nullptr;
39+
#ifdef HAVE_SERVER_PYTHON_PLUGINS
40+
accessControl = serverIface->accessControls();
41+
cacheManager = serverIface->cacheManager();
42+
#endif
3943
if ( cacheManager )
4044
{
4145
QgsWmtsParameters::Format f = params.format();

0 commit comments

Comments
 (0)