trim proj4 parameters for sql queries (#5598)

etiennesky · etiennesky · commit e3f25dae8705 · 2012-05-19T02:11:23.000-03:00
diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -496,9 +496,10 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString theProj4String
 
     // split on spaces followed by a plus sign (+) to deal
     // also with parameters containing spaces (e.g. +nadgrids)
+    // make sure result is trimmed (#5598)
     foreach( QString param, theProj4String.split( QRegExp( "\\s+(?=\\+)" ), QString::SkipEmptyParts ) )
     {
-      QString arg = QString( "' '||parameters||' ' LIKE %1" ).arg( quotedValue( QString( "% %1 %" ).arg( param ) ) );
+      QString arg = QString( "' '||parameters||' ' LIKE %1" ).arg( quotedValue( QString( "% %1 %" ).arg( param.trimmed() ) ) );
       if ( param.startsWith( "+datum=" ) )
       {
         datum = arg;

Original file line number	Diff line number	Diff line change
`@@ -496,9 +496,10 @@ bool QgsCoordinateReferenceSystem::createFromProj4( const QString theProj4String`
`496`	`496`
`497`	`497`	`// split on spaces followed by a plus sign (+) to deal`
`498`	`498`	`// also with parameters containing spaces (e.g. +nadgrids)`
	`499`	`+ // make sure result is trimmed (#5598)`
`499`	`500`	`foreach( QString param, theProj4String.split( QRegExp( "\\s+(?=\\+)" ), QString::SkipEmptyParts ) )`
`500`	`501`	`{`
`501`		`- QString arg = QString( "' '\|\|parameters\|\|' ' LIKE %1" ).arg( quotedValue( QString( "% %1 %" ).arg( param ) ) );`
	`502`	`+ QString arg = QString( "' '\|\|parameters\|\|' ' LIKE %1" ).arg( quotedValue( QString( "% %1 %" ).arg( param.trimmed() ) ) );`
`502`	`503`	`if ( param.startsWith( "+datum=" ) )`
`503`	`504`	`{`
`504`	`505`	`datum = arg;`