fix for #1030

jef · jef · commit da15ba5946b6 · 2008-04-11T12:17:37.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8336 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2195,7 +2195,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
       {
         QgsDebugMsg("Beautifying layer name " + name());
         // adjust the display name for postgres layers
-        QRegExp reg("\".+\"\\.\"(.+)\"");
+        QRegExp reg("\"[^\"]+\"\\.\"([^\"]+)\"");
         reg.indexIn(name());
         QStringList stuff = reg.capturedTexts();
         QString lName = stuff[1];

Original file line number	Diff line number	Diff line change
`@@ -2195,7 +2195,7 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )`
`2195`	`2195`	`{`
`2196`	`2196`	`QgsDebugMsg("Beautifying layer name " + name());`
`2197`	`2197`	`// adjust the display name for postgres layers`
`2198`		`- QRegExp reg("\".+\"\\.\"(.+)\"");`
	`2198`	`+ QRegExp reg("\"[^\"]+\"\\.\"([^\"]+)\"");`
`2199`	`2199`	`reg.indexIn(name());`
`2200`	`2200`	`QStringList stuff = reg.capturedTexts();`
`2201`	`2201`	`QString lName = stuff[1];`