sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken regexps in server which disable the layer/attribute name

Browse Source 
cleaning
This commit is contained in:
Nyall Dawson 2022-08-18 15:50:15 +10:00
parent 77aa81ce9d
commit 0a45c064bd
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/services/wfs/qgswfsdescribefeaturetype.cpp
View File

@ -236,7 +236,8 @@ namespace QgsWfs
//xsd:element //xsd:element
QDomElement attElem = doc.createElement( QStringLiteral( "element" )/*xsd:element*/ ); QDomElement attElem = doc.createElement( QStringLiteral( "element" )/*xsd:element*/ );
attElem.setAttribute( QStringLiteral( "name" ), attributeName.replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); const thread_local QRegularExpression sCleanTagNameRegExp( QStringLiteral( "[^\\w\\.-_]" ), QRegularExpression::PatternOption::UseUnicodePropertiesOption );
attElem.setAttribute( QStringLiteral( "name" ), attributeName.replace( ' ', '_' ).replace( sCleanTagNameRegExp, QString() ) );
const QVariant::Type attributeType = field.type(); const QVariant::Type attributeType = field.type();
if ( attributeType == QVariant::Int ) if ( attributeType == QVariant::Int )
{ {

8
src/server/services/wfs/qgswfsgetfeature.cpp
View File

@ -39,6 +39,8 @@
#include "qgswfsgetfeature.h" #include "qgswfsgetfeature.h"
#include <QRegularExpression>
namespace QgsWfs namespace QgsWfs
{ {
@ -272,7 +274,8 @@ namespace QgsWfs
for ( const QgsField &field : fields ) for ( const QgsField &field : fields )
{ {
fieldnames.append( field.name() ); fieldnames.append( field.name() );
propertynames.append( field.name().replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ) ); const thread_local QRegularExpression sCleanTagNameRegExp( QStringLiteral( "[^\\w\\.-_]" ), QRegularExpression::PatternOption::UseUnicodePropertiesOption );
propertynames.append( field.name().replace( ' ', '_' ).replace( sCleanTagNameRegExp, QString() ) );
} }
QString fieldName; QString fieldName;
for ( plstIt = propertyList.constBegin(); plstIt != propertyList.constEnd(); ++plstIt ) for ( plstIt = propertyList.constBegin(); plstIt != propertyList.constEnd(); ++plstIt )
@ -1547,7 +1550,8 @@ namespace QgsWfs
QDomElement createFieldElement( const QgsField &field, const QVariant &value, QDomDocument &doc ) QDomElement createFieldElement( const QgsField &field, const QVariant &value, QDomDocument &doc )
{ {
const QgsEditorWidgetSetup setup = field.editorWidgetSetup(); const QgsEditorWidgetSetup setup = field.editorWidgetSetup();
const QString attributeName = field.name().replace( ' ', '_' ).replace( cleanTagNameRegExp, QString() ); const thread_local QRegularExpression sCleanTagNameRegExp( QStringLiteral( "[^\\w\\.-_]" ), QRegularExpression::PatternOption::UseUnicodePropertiesOption );
const QString attributeName = field.name().replace( ' ', '_' ).replace( sCleanTagNameRegExp, QString() );
QDomElement fieldElem = doc.createElement( QStringLiteral( "qgs:" ) + attributeName ); QDomElement fieldElem = doc.createElement( QStringLiteral( "qgs:" ) + attributeName );
if ( QgsVariantUtils::isNull( value ) ) if ( QgsVariantUtils::isNull( value ) )
{ {

3
src/server/services/wfs/qgswfsutils.h
View File

@ -74,9 +74,6 @@ namespace QgsWfs
const QString OGC_NAMESPACE = QStringLiteral( "http://www.opengis.net/ogc" ); const QString OGC_NAMESPACE = QStringLiteral( "http://www.opengis.net/ogc" );
const QString QGS_NAMESPACE = QStringLiteral( "http://www.qgis.org/gml" ); const QString QGS_NAMESPACE = QStringLiteral( "http://www.qgis.org/gml" );
// Define clean tagName regExp
const QRegExp cleanTagNameRegExp( "(?![\\w\\d\\.-])." );
} // namespace QgsWfs } // namespace QgsWfs
#endif #endif

5
src/server/services/wms/qgswmsgetcontext.cpp
View File

@ -31,6 +31,8 @@
#include "qgsexception.h" #include "qgsexception.h"
#include <QRegularExpression>
namespace QgsWms namespace QgsWms
{ {
namespace namespace
@ -308,7 +310,8 @@ namespace QgsWms
// layer wms name // layer wms name
layerElem.setAttribute( QStringLiteral( "name" ), wmsName ); layerElem.setAttribute( QStringLiteral( "name" ), wmsName );
// define an id based on layer wms name // define an id based on layer wms name
layerElem.setAttribute( QStringLiteral( "id" ), wmsName.replace( QRegExp( "[\\W]" ), QStringLiteral( "_" ) ) ); const thread_local QRegularExpression sRegEx( QStringLiteral( "[\\W]" ), QRegularExpression::UseUnicodePropertiesOption );
layerElem.setAttribute( QStringLiteral( "id" ), wmsName.replace( sRegEx, QStringLiteral( "_" ) ) );
// layer title // layer title
QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) ); QDomElement titleElem = doc.createElement( QStringLiteral( "ows:Title" ) );