Fix regexp_substr expression to correctly return only first matched group, not entire matched string

nyalldawson · nyalldawson · commit 41f8abb15900 · 2013-08-08T14:15:15.000+10:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -688,7 +688,7 @@ static QVariant fcnRegexpSubstr( const QVariantList& values, const QgsFeature* ,
   if ( re.captureCount() > 0 )
   {
     // return first capture
-    return QVariant( re.capturedTexts()[0] );
+    return QVariant( re.capturedTexts()[1] );
   }
   else
   {
@@ -1661,7 +1661,7 @@ bool QgsExpression::needsGeometry()
 
 void QgsExpression::initGeomCalculator()
 {
-  if( mCalc )
+  if ( mCalc )
     return;
 
   // Use planimetric as default
@@ -1671,7 +1671,7 @@ void QgsExpression::initGeomCalculator()
 
 void QgsExpression::setGeomCalculator( QgsDistanceArea &calc )
 {
-  if( !mCalc )
+  if ( !mCalc )
     mCalc = new QgsDistanceArea();
 
   // Copy from supplied calculator

Original file line number	Diff line number	Diff line change
`@@ -688,7 +688,7 @@ static QVariant fcnRegexpSubstr( const QVariantList& values, const QgsFeature* ,`
`688`	`688`	`if ( re.captureCount() > 0 )`
`689`	`689`	`{`
`690`	`690`	`// return first capture`
`691`		`- return QVariant( re.capturedTexts()[0] );`
	`691`	`+ return QVariant( re.capturedTexts()[1] );`
`692`	`692`	`}`
`693`	`693`	`else`
`694`	`694`	`{`
`@@ -1661,7 +1661,7 @@ bool QgsExpression::needsGeometry()`
`1661`	`1661`
`1662`	`1662`	`void QgsExpression::initGeomCalculator()`
`1663`	`1663`	`{`
`1664`		`- if( mCalc )`
	`1664`	`+ if ( mCalc )`
`1665`	`1665`	`return;`
`1666`	`1666`
`1667`	`1667`	`// Use planimetric as default`
`@@ -1671,7 +1671,7 @@ void QgsExpression::initGeomCalculator()`
`1671`	`1671`
`1672`	`1672`	`void QgsExpression::setGeomCalculator( QgsDistanceArea &calc )`
`1673`	`1673`	`{`
`1674`		`- if( !mCalc )`
	`1674`	`+ if ( !mCalc )`
`1675`	`1675`	`mCalc = new QgsDistanceArea();`
`1676`	`1676`
`1677`	`1677`	`// Copy from supplied calculator`