Skip to content

Commit

Permalink
Merge pull request #9179 from elpaso/server-tiny-improvements
Browse files Browse the repository at this point in the history
Server tiny improvements
  • Loading branch information
elpaso committed Feb 16, 2019
2 parents 2c25c3d + 53a14e2 commit 6b7ba0d
Show file tree
Hide file tree
Showing 3 changed files with 429 additions and 472 deletions.
4 changes: 0 additions & 4 deletions src/app/qgsprojectproperties.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,6 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
bool addWktGeometry = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSAddWktGeometry" ), QStringLiteral( "/" ) );
mAddWktGeometryCheckBox->setChecked( addWktGeometry );

bool requestDefinedSources = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSRequestDefinedDataSources" ), QStringLiteral( "/" ), false );
mAllowRequestDefinedDataSourcesBox->setChecked( requestDefinedSources );

bool segmentizeFeatureInfoGeometry = QgsProject::instance()->readBoolEntry( QStringLiteral( "WMSSegmentizeFeatureInfoGeometry" ), QStringLiteral( "/" ) );
mSegmentizeFeatureInfoGeometryCheckBox->setChecked( segmentizeFeatureInfoGeometry );

Expand Down Expand Up @@ -1265,7 +1262,6 @@ void QgsProjectProperties::apply()
}

QgsProject::instance()->writeEntry( QStringLiteral( "WMSAddWktGeometry" ), QStringLiteral( "/" ), mAddWktGeometryCheckBox->isChecked() );
QgsProject::instance()->writeEntry( QStringLiteral( "WMSRequestDefinedDataSources" ), QStringLiteral( "/" ), mAllowRequestDefinedDataSourcesBox->isChecked() );
QgsProject::instance()->writeEntry( QStringLiteral( "WMSSegmentizeFeatureInfoGeometry" ), QStringLiteral( "/" ), mSegmentizeFeatureInfoGeometryCheckBox->isChecked() );
QgsProject::instance()->writeEntry( QStringLiteral( "WMSUseLayerIDs" ), QStringLiteral( "/" ), mWmsUseLayerIDs->isChecked() );

Expand Down
2 changes: 1 addition & 1 deletion src/server/qgsfcgiserverrequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void QgsFcgiServerRequest::printRequestInfos()
{
if ( getenv( envVar.toStdString().c_str() ) )
{
QgsMessageLog::logMessage( envVar + QString( getenv( envVar.toStdString().c_str() ) ), QStringLiteral( "Server" ), Qgis::Info );
QgsMessageLog::logMessage( QStringLiteral( "%1: %2" ).arg( envVar ).arg( QString( getenv( envVar.toStdString().c_str() ) ) ), QStringLiteral( "Server" ), Qgis::Info );
}
}
}

0 comments on commit 6b7ba0d

Please sign in to comment.