sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #1644

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10605 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-04-20 19:29:55 +00:00
parent 969e9f0d5a
commit 4ac3e65491
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/qgsvectorlayer.cpp
View File

@ -2188,11 +2188,11 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
// adjust the display name for postgres layers
QRegExp reg( "\"[^\"]+\"\\.\"([^\"]+)\" \\(([^)]+)\\)" );
reg.indexIn( name() );
QStringList stuff = reg.capturedTexts();
QString lName = stuff[1];
if ( stuff.size() == 3 )
if ( reg.indexIn( name() ) >= 0 )
{
QStringList stuff = reg.capturedTexts();
QString lName = stuff[1];
const QMap<QString, QgsMapLayer*> &layers = QgsMapLayerRegistry::instance()->mapLayers();
QMap<QString, QgsMapLayer*>::const_iterator it;
@ -2201,10 +2201,11 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
if ( it != layers.constEnd() )
lName += "." + stuff[2];
if ( !lName.isEmpty() )
setLayerName( lName );
}
else if ( lName.length() == 0 ) // fallback
lName = name();
setLayerName( lName );
QgsDebugMsg( "Beautifying layer name " + name() );
// deal with unnecessary schema qualification to make v.in.ogr happy