Make QgsDataSourceURI uri string parser skip invalid portions instead of skipping the entire string

manisandro · m-kuhn · commit 258851af9924 · 2015-09-09T17:37:58.000+02:00
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
@@ -64,8 +64,8 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )
 
     if ( i == uri.length() || uri[i] != '=' )
     {
-      QgsDebugMsg( "= expected after parameter name" );
-      return;
+      QgsDebugMsg( QString( "= expected after parameter name, skipping text '%1'" ).arg( pname ) );
+      continue;
     }
 
     i++;
@@ -101,7 +101,6 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )
           i++;
 
           int start = i;
-          QString col;
           while ( i < uri.length() && uri[i] != ')' )
           {
             if ( uri[i] == '\\' )

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )`
`64`	`64`
`65`	`65`	`if ( i == uri.length() \|\| uri[i] != '=' )`
`66`	`66`	`{`
`67`		`- QgsDebugMsg( "= expected after parameter name" );`
`68`		`- return;`
	`67`	`+ QgsDebugMsg( QString( "= expected after parameter name, skipping text '%1'" ).arg( pname ) );`
	`68`	`+ continue;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`i++;`
`@@ -101,7 +101,6 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )`
`101`	`101`	`i++;`
`102`	`102`
`103`	`103`	`int start = i;`
`104`		`- QString col;`
`105`	`104`	`while ( i < uri.length() && uri[i] != ')' )`
`106`	`105`	`{`
`107`	`106`	`if ( uri[i] == '\\' )`