Skip to content
Permalink
Browse files

wfs provider: fix support for non-ascii wfs layer names (fix #7848)

  • Loading branch information
jef-n committed Jul 16, 2013
1 parent af8479e commit e27e843374cc660d62e94343f360a7f33279724e
Showing with 2 additions and 4 deletions.
  1. +2 −2 src/core/qgsgml.cpp
  2. +0 −2 src/providers/wfs/qgswfsprovider.cpp
@@ -197,7 +197,7 @@ void QgsGml::handleProgressEvent( qint64 progress, qint64 totalSteps )

void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )
{
QString elementName( el );
QString elementName( QString::fromUtf8( el ) );
ParseMode theParseMode( mParseModeStack.isEmpty() ? none : mParseModeStack.top() );
QStringList splitName = elementName.split( NS_SEPARATOR );
QString localName = splitName.last();
@@ -279,7 +279,7 @@ void QgsGml::startElement( const XML_Char* el, const XML_Char** attr )

void QgsGml::endElement( const XML_Char* el )
{
QString elementName( el );
QString elementName( QString::fromUtf8( el ) );
ParseMode theParseMode( mParseModeStack.isEmpty() ? none : mParseModeStack.top() );
QStringList splitName = elementName.split( NS_SEPARATOR );
QString localName = splitName.last();
@@ -701,9 +701,7 @@ int QgsWFSProvider::getFeatureGET( const QString& uri, const QString& geometryAt
}

QString typeName = parameterFromUrl( "typename" );
//QgsWFSData dataReader( uri, &mExtent, mFeatures, mIdMap, geometryAttribute, thematicAttributes, &mWKBType );
QgsGml dataReader( typeName, geometryAttribute, mFields );
//dataReader.setFeatureType( typeName, geometryAttribute, mFields );

QObject::connect( &dataReader, SIGNAL( dataProgressAndSteps( int , int ) ), this, SLOT( handleWFSProgressMessage( int, int ) ) );

0 comments on commit e27e843

Please sign in to comment.
You can’t perform that action at this time.