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

Order map keys by length before using in replace function

Browse Source 
Fix #42940
This commit is contained in:
Stefanos Natsis 2021-04-27 07:05:23 +03:00 committed by GitHub
parent fc51887aa4
commit 9a42f23491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/function_help/json/replace
View File

@ -13,9 +13,10 @@
{ "expression":"replace('QGIS ABC',array('A','B','C'),array('X','Y','Z'))", "returns":"'QGIS XYZ'"}, { "expression":"replace('QGIS ABC',array('A','B','C'),array('X','Y','Z'))", "returns":"'QGIS XYZ'"},
{ "expression":"replace('QGIS',array('Q','S'),'')", "returns":"'GI'"} ] }, { "expression":"replace('QGIS',array('Q','S'),'')", "returns":"'GI'"} ] },
{ "variant": "Map variant", { "variant": "Map variant",
"variant_description": "Returns a string with the supplied map keys replaced by paired values.", "variant_description": "Returns a string with the supplied map keys replaced by paired values. Longer map keys are evaluated first.",
"arguments": [ {"arg":"string","description":"the input string"}, "arguments": [ {"arg":"string","description":"the input string"},
{"arg":"map","description":"the map containing keys and values"} ], {"arg":"map","description":"the map containing keys and values"} ],
"examples": [ { "expression":"replace('APP SHOULD ROCK',map('APP','QGIS','SHOULD','DOES'))", "returns":"'QGIS DOES ROCK'"} ] "examples": [ { "expression":"replace('APP SHOULD ROCK',map('APP','QGIS','SHOULD','DOES'))", "returns":"'QGIS DOES ROCK'"},
{ "expression":"replace('forty two',map('for','4','two','2','forty two','42'))", "returns":"'42'"} ]
}] }]
} }

17
src/core/expression/qgsexpressionfunction.cpp
View File

@ -1392,10 +1392,25 @@ static QVariant fcnReplace( const QVariantList &values, const QgsExpressionConte
{ {
QString str = QgsExpressionUtils::getStringValue( values.at( 0 ), parent ); QString str = QgsExpressionUtils::getStringValue( values.at( 0 ), parent );
QVariantMap map = QgsExpressionUtils::getMapValue( values.at( 1 ), parent ); QVariantMap map = QgsExpressionUtils::getMapValue( values.at( 1 ), parent );
QVector< QPair< QString, QString > > mapItems;
for ( QVariantMap::const_iterator it = map.constBegin(); it != map.constEnd(); ++it ) for ( QVariantMap::const_iterator it = map.constBegin(); it != map.constEnd(); ++it )
{ {
str = str.replace( it.key(), it.value().toString() ); mapItems.append( qMakePair( it.key(), it.value().toString() ) );
}
// larger keys should be replaced first since they may contain whole smaller keys
std::sort( mapItems.begin(),
mapItems.end(),
[]( const QPair< QString, QString > &pair1,
const QPair< QString, QString > &pair2 )
{
return ( pair1.first.length() > pair2.first.length() );
} );
for ( auto it = mapItems.constBegin(); it != mapItems.constEnd(); ++it )
{
str = str.replace( it->first, it->second );
} }
return QVariant( str ); return QVariant( str );

1
tests/src/core/testqgsexpression.cpp
View File

@ -1316,6 +1316,7 @@ class TestQgsExpression: public QObject
QTest::newRow( "replace (unbalanced array, before > after)" ) << "replace('12345', array('1','2','3'), array('6','7'))" << true << QVariant(); QTest::newRow( "replace (unbalanced array, before > after)" ) << "replace('12345', array('1','2','3'), array('6','7'))" << true << QVariant();
QTest::newRow( "replace (unbalanced array, before < after)" ) << "replace('12345', array('1','2'), array('6','7','8'))" << true << QVariant(); QTest::newRow( "replace (unbalanced array, before < after)" ) << "replace('12345', array('1','2'), array('6','7','8'))" << true << QVariant();
QTest::newRow( "replace (map)" ) << "replace('APP SHOULD ROCK',map('APP','QGIS','SHOULD','DOES'))" << false << QVariant( "QGIS DOES ROCK" ); QTest::newRow( "replace (map)" ) << "replace('APP SHOULD ROCK',map('APP','QGIS','SHOULD','DOES'))" << false << QVariant( "QGIS DOES ROCK" );
QTest::newRow( "replace (map with overlapping keys)" ) << "replace('11111',map('1','small','11','large'))" << false << QVariant( "largelargesmall" );
QTest::newRow( "regexp_replace" ) << "regexp_replace('HeLLo','[eL]+', '-')" << false << QVariant( "H-o" ); QTest::newRow( "regexp_replace" ) << "regexp_replace('HeLLo','[eL]+', '-')" << false << QVariant( "H-o" );
QTest::newRow( "regexp_replace greedy" ) << "regexp_replace('HeLLo','(?<=H).*L', '-')" << false << QVariant( "H-o" ); QTest::newRow( "regexp_replace greedy" ) << "regexp_replace('HeLLo','(?<=H).*L', '-')" << false << QVariant( "H-o" );
QTest::newRow( "regexp_replace non greedy" ) << "regexp_replace('HeLLo','(?<=H).*?L', '-')" << false << QVariant( "H-Lo" ); QTest::newRow( "regexp_replace non greedy" ) << "regexp_replace('HeLLo','(?<=H).*?L', '-')" << false << QVariant( "H-Lo" );