Skip to content
Permalink
Browse files

Validation after merging

  • Loading branch information
rldhont committed Nov 14, 2012
1 parent a3289e8 commit 36da82ab54c7ca77e26121638ffbee07c3c5b666
Showing with 21 additions and 20 deletions.
  1. +12 −11 src/core/qgsexpression.cpp
  2. +9 −9 src/mapserver/qgswfsserver.cpp
@@ -1110,8 +1110,8 @@ const QList<QgsExpression::Function*> &QgsExpression::Functions()
<< new StaticFunction( "$x", 0, fcnX, QObject::tr( "Geometry" ), "", true )
<< new StaticFunction( "$y", 0, fcnY, QObject::tr( "Geometry" ), "" , true )
<< new StaticFunction( "$geometry", 0, fcnGeometry, QObject::tr( "Geometry" ), "" , true )
<< new StaticFunction( "GeomFromWKT", 1, fcnGeomFromWKT, QObject::tr( "Geometry" ) )
<< new StaticFunction( "GeomFromGML2", 1, fcnGeomFromGML2, QObject::tr( "Geometry" ) )
<< new StaticFunction( "geomFromWKT", 1, fcnGeomFromWKT, QObject::tr( "Geometry" ) )
<< new StaticFunction( "geomFromGML2", 1, fcnGeomFromGML2, QObject::tr( "Geometry" ) )
<< new StaticFunction( "bbox", 2, fcnBbox, QObject::tr( "Geometry" ) )
<< new StaticFunction( "disjoint", 2, fcnDisjoint, QObject::tr( "Geometry" ) )
<< new StaticFunction( "intersects", 2, fcnIntersects, QObject::tr( "Geometry" ) )
@@ -2081,7 +2081,8 @@ QgsExpression::Node* QgsExpression::NodeBinaryOperator::createFromOgcFilter( QDo

if ( !opLeft && !opRight )
{
errorMessage = QString( "'%1' binary operator not supported." ).arg( element.tagName() );
if ( errorMessage.isEmpty() )
errorMessage = QString( "'%1' binary operator not supported." ).arg( element.tagName() );
return NULL;
}

@@ -2246,7 +2247,7 @@ void QgsExpression::NodeFunction::toOgcFilter( QDomDocument &doc, QDomElement &e
if ( ogcOperatorName.isEmpty() )
continue;

if ( fd.mName == ogcOperatorName.toLower() )
if ( fd->name() == ogcOperatorName.toLower() )
{
isSpatial = true;
QDomElement funcElem = doc.createElement( "ogc:"+ogcOperatorName );
@@ -2289,7 +2290,7 @@ void QgsExpression::NodeFunction::toOgcFilter( QDomDocument &doc, QDomElement &e
if ( !isSpatial )
{
QDomElement funcElem = doc.createElement( "ogc:Function" );
funcElem.setAttribute( "name", fd.mName );
funcElem.setAttribute( "name", fd->name() );
mArgs->toOgcFilter( doc, funcElem );
element.appendChild( funcElem );
}
@@ -2313,20 +2314,20 @@ QgsExpression::Node* QgsExpression::NodeFunction::createFromOgcFilter( QDomEleme
int geomIdx = 0;
int gml2Idx = 0;
int opeIdx = 0;
for ( int j = 0; j < BuiltinFunctions().size(); j++ )
for ( int j = 0; j < Functions().size(); j++ )
{
QgsExpression::FunctionDef funcDef = BuiltinFunctions()[j];
if ( funcDef.mName == "$geometry" )
QgsExpression::Function* funcDef = Functions()[j];
if ( funcDef->name() == "$geometry" )
geomIdx = j;
else if ( funcDef.mName == "geomFromGML2" )
else if ( funcDef->name() == "geomFromGML2" )
gml2Idx = j;
else if ( funcDef.mName == ogcOperatorName.toLower() )
else if ( funcDef->name() == ogcOperatorName.toLower() )
opeIdx = j;
}

if (geomIdx == 0 || gml2Idx == 0 || opeIdx == 0 )
{
errorMessage = QString( "spatial functions not find, got %1, %2, %3" ).arg( geomIdx ).arg( gml2Idx ).arg( opeIdx );
errorMessage = QString( "spatial functions not find %1, got %2, %3, %4" ).arg( ogcOperatorName ).arg( geomIdx ).arg( gml2Idx ).arg( opeIdx );
return NULL;
}

@@ -585,14 +585,14 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
}
}

//read cql_filter
bool cqlFilterOk = false;
QString cqlFilter;
QMap<QString, QString>::const_iterator cqlFilterIt = mParameterMap.find( "CQL_FILTER" );
if ( cqlFilterIt != mParameterMap.end() )
//read exp_filter
bool expFilterOk = false;
QString expFilter;
QMap<QString, QString>::const_iterator expFilterIt = mParameterMap.find( "EXP_FILTER" );
if ( expFilterIt != mParameterMap.end() )
{
cqlFilterOk = true;
cqlFilter = cqlFilterIt.value();
expFilterOk = true;
expFilter = expFilterIt.value();
}

bool conversionSuccess;
@@ -676,10 +676,10 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
provider->featureAtId( fid.toInt(), feature, mWithGeom, attrIndexes );
sendGetFeature( request, format, &feature, 0, layerCrs, fields, layerExcludedAttributes );
}
else if ( cqlFilterOk )
else if ( expFilterOk )
{
provider->select( attrIndexes, searchRect, mWithGeom, true );
QgsExpression *mFilter = new QgsExpression( cqlFilter );
QgsExpression *mFilter = new QgsExpression( expFilter );
if (mFilter->hasParserError())
{
throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );

0 comments on commit 36da82a

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