handle ogr sublayers with colon

jef-n · jef-n · commit 2b703e397cd7 · 2015-06-24T18:08:27.000+02:00
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -2995,7 +2995,15 @@ bool QgisApp::addVectorLayers( const QStringList &theLayerQStringList, const QSt
         QStringList sublayers = layer->dataProvider()->subLayers();
         QStringList elements = sublayers.at( 0 ).split( ":" );
         if ( layer->storageType() != "GeoJSON" )
+        {
+          while ( elements.size() > 4 )
+          {
+            elements[1] += ":" + elements[2];
+            elements.removeAt( 2 );
+          }
+
           layer->setLayerName( elements.at( 1 ) );
+        }
         myList << layer;
       }
       else
@@ -3320,8 +3328,20 @@ void QgisApp::loadOGRSublayers( QString layertype, QString uri, QStringList list
   for ( int i = 0; i < list.size(); i++ )
   {
     QString composedURI;
-    QString layerName = list.at( i ).split( ':' ).value( 0 );
-    QString layerType = list.at( i ).split( ':' ).value( 1 );
+    QStringList elements = list.at( i ).split( ":" );
+    while ( elements.size() > 2 )
+    {
+      elements[0] += ":" + elements[1];
+      elements.removeAt( 1 );
+    }
+
+    QString layerName = elements.value( 0 );
+    QString layerType = elements.value( 1 );
+    if ( layerType == "any" )
+    {
+      layerType = "";
+      list.removeAt( 1 );
+    }
 
     if ( layertype != "GRASS" )
     {
diff --git a/src/gui/qgssublayersdialog.cpp b/src/gui/qgssublayersdialog.cpp
@@ -81,10 +81,16 @@ QStringList QgsSublayersDialog::selectionNames()
         count++;
       }
     }
+
     if ( count > 1 )
     {
       name += ":" + layersTable->selectedItems().at( i )->text( 3 );
     }
+    else
+    {
+      name += ":any";
+    }
+
     list << name;
   }
   return list;
@@ -104,7 +110,13 @@ void QgsSublayersDialog::populateLayerTable( QStringList theList, QString delim
 {
   foreach ( QString item, theList )
   {
-    layersTable->addTopLevelItem( new QTreeWidgetItem( item.split( delim ) ) );
+    QStringList elements = item.split( delim );
+    while ( elements.size() > 4 )
+    {
+      elements[1] += delim + elements[2];
+      elements.removeAt( 2 );
+    }
+    layersTable->addTopLevelItem( new QTreeWidgetItem( elements ) );
   }
 
   // resize columns

Original file line number	Diff line number	Diff line change
`@@ -81,10 +81,16 @@ QStringList QgsSublayersDialog::selectionNames()`
`81`	`81`	`count++;`
`82`	`82`	`}`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`if ( count > 1 )`
`85`	`86`	`{`
`86`	`87`	`name += ":" + layersTable->selectedItems().at( i )->text( 3 );`
`87`	`88`	`}`
	`89`	`+ else`
	`90`	`+ {`
	`91`	`+ name += ":any";`
	`92`	`+ }`
	`93`	`+`
`88`	`94`	`list << name;`
`89`	`95`	`}`
`90`	`96`	`return list;`
`@@ -104,7 +110,13 @@ void QgsSublayersDialog::populateLayerTable( QStringList theList, QString delim`
`104`	`110`	`{`
`105`	`111`	`foreach ( QString item, theList )`
`106`	`112`	`{`
`107`		`- layersTable->addTopLevelItem( new QTreeWidgetItem( item.split( delim ) ) );`
	`113`	`+ QStringList elements = item.split( delim );`
	`114`	`+ while ( elements.size() > 4 )`
	`115`	`+ {`
	`116`	`+ elements[1] += delim + elements[2];`
	`117`	`+ elements.removeAt( 2 );`
	`118`	`+ }`
	`119`	`+ layersTable->addTopLevelItem( new QTreeWidgetItem( elements ) );`
`108`	`120`	`}`
`109`	`121`
`110`	`122`	`// resize columns`