Initial support for extension-based scan on multiple layers

qgis · Aug 9, 2017 · 030b234 · 030b234
1 parent e19c60b
commit 030b234
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -336,9 +336,17 @@ QGISEXTERN QgsDataItem *dataItem( QString path, QgsDataItem *parentItem )
         OGR_DS_Destroy( hDataSource );
       }
     }
-    // add the item
-    // TODO: how to handle collections?
-    QgsLayerItem *item = new QgsOgrLayerItem( parentItem, name, path, path, QgsLayerItem::Vector );
+    // Handle collections
+    // Check if the layer has sublayers by comparing the extension
+    QgsDataItem *item;
+    QStringList multipleLayersExtensions;
+    // TODO: add more formats here!
+    multipleLayersExtensions << QLatin1String( "gpkg" ) << QLatin1String( "sqlite" );
+    if ( ! multipleLayersExtensions.contains( suffix ) )
+      item = new QgsOgrLayerItem( parentItem, name, path, path, QgsLayerItem::Vector );
+    else
+      item = new QgsOgrDataCollectionItem( parentItem, name, path );
+
     if ( item )
       return item;
   }