fix browser handling of auxiliary metadata files (*.shp.xml and *.tif.xml) (#10697)

etiennesky · etiennesky · commit b261f57d0629 · 2014-06-24T14:33:31.000-03:00
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
@@ -551,8 +551,11 @@ void QgsBrowserDockWidget::showProperties( )
         QgsRasterLayer* layer = new QgsRasterLayer( layerItem->uri(), layerItem->uri(), layerItem->providerKey() );
         if ( layer != NULL )
         {
-          layerCrs = layer->crs();
-          layerMetadata = layer->metadata();
+          if ( layer->isValid() )
+          {
+            layerCrs = layer->crs();
+            layerMetadata = layer->metadata();
+          }
           delete layer;
         }
       }
@@ -562,8 +565,11 @@ void QgsBrowserDockWidget::showProperties( )
         QgsVectorLayer* layer = new QgsVectorLayer( layerItem->uri(), layerItem->name(), layerItem->providerKey() );
         if ( layer != NULL )
         {
-          layerCrs = layer->crs();
-          layerMetadata = layer->metadata();
+          if ( layer->isValid() )
+          {
+            layerCrs = layer->crs();
+            layerMetadata = layer->metadata();
+          }
           delete layer;
         }
       }
diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp
@@ -191,11 +191,18 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
     QgsDebugMsgLevel( "wildcards: " + wildcards.join( " " ), 2 );
   }
 
-  // skip *.aux.xml files (GDAL auxilary metadata files)
+  // skip *.aux.xml files (GDAL auxilary metadata files),
+  // *.shp.xml files (ESRI metadata) and *.tif.xml files (TIFF metadata)
   // unless that extension is in the list (*.xml might be though)
   if ( thePath.endsWith( ".aux.xml", Qt::CaseInsensitive ) &&
        !extensions.contains( "aux.xml" ) )
     return 0;
+  if ( thePath.endsWith( ".shp.xml", Qt::CaseInsensitive ) &&
+       !extensions.contains( "shp.xml" ) )
+    return 0;
+  if ( thePath.endsWith( ".tif.xml", Qt::CaseInsensitive ) &&
+       !extensions.contains( "tif.xml" ) )
+    return 0;
 
   // Filter files by extension
   if ( !extensions.contains( suffix ) )
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -280,14 +280,18 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
 
   QStringList myExtensions = fileExtensions();
 
-  // skip *.aux.xml files (GDAL auxilary metadata files) and .shp.xml files (ESRI metadata)
+  // skip *.aux.xml files (GDAL auxilary metadata files),
+  // *.shp.xml files (ESRI metadata) and *.tif.xml files (TIFF metadata)
   // unless that extension is in the list (*.xml might be though)
   if ( thePath.endsWith( ".aux.xml", Qt::CaseInsensitive ) &&
        !myExtensions.contains( "aux.xml" ) )
     return 0;
   if ( thePath.endsWith( ".shp.xml", Qt::CaseInsensitive ) &&
        !myExtensions.contains( "shp.xml" ) )
     return 0;
+  if ( thePath.endsWith( ".tif.xml", Qt::CaseInsensitive ) &&
+       !myExtensions.contains( "tif.xml" ) )
+    return 0;
 
   // We have to filter by extensions, otherwise e.g. all Shapefile files are displayed
   // because OGR drive can open also .dbf, .shx.

Original file line number	Diff line number	Diff line change
`@@ -551,8 +551,11 @@ void QgsBrowserDockWidget::showProperties( )`
`551`	`551`	`QgsRasterLayer* layer = new QgsRasterLayer( layerItem->uri(), layerItem->uri(), layerItem->providerKey() );`
`552`	`552`	`if ( layer != NULL )`
`553`	`553`	`{`
`554`		`- layerCrs = layer->crs();`
`555`		`- layerMetadata = layer->metadata();`
	`554`	`+ if ( layer->isValid() )`
	`555`	`+ {`
	`556`	`+ layerCrs = layer->crs();`
	`557`	`+ layerMetadata = layer->metadata();`
	`558`	`+ }`
`556`	`559`	`delete layer;`
`557`	`560`	`}`
`558`	`561`	`}`
`@@ -562,8 +565,11 @@ void QgsBrowserDockWidget::showProperties( )`
`562`	`565`	`QgsVectorLayer* layer = new QgsVectorLayer( layerItem->uri(), layerItem->name(), layerItem->providerKey() );`
`563`	`566`	`if ( layer != NULL )`
`564`	`567`	`{`
`565`		`- layerCrs = layer->crs();`
`566`		`- layerMetadata = layer->metadata();`
	`568`	`+ if ( layer->isValid() )`
	`569`	`+ {`
	`570`	`+ layerCrs = layer->crs();`
	`571`	`+ layerMetadata = layer->metadata();`
	`572`	`+ }`
`567`	`573`	`delete layer;`
`568`	`574`	`}`
`569`	`575`	`}`