fixed browser single layer zip files path, fixes hopefully #11871

blazek · blazek · commit b843f81895f5 · 2015-01-21T10:46:37.000+01:00
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -1280,7 +1280,6 @@ QVector<QgsDataItem*> QgsZipItem::createChildren()
 {
   QVector<QgsDataItem*> children;
   QString tmpPath;
-  QString childPath;
   QSettings settings;
   QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
 
@@ -1330,7 +1329,6 @@ QVector<QgsDataItem*> QgsZipItem::createChildren()
         if ( item )
         {
           QgsDebugMsgLevel( "loaded item", 3 );
-          childPath = tmpPath;
           children.append( item );
           break;
         }
@@ -1343,12 +1341,6 @@ QVector<QgsDataItem*> QgsZipItem::createChildren()
 
   }
 
-  if ( children.size() == 1 )
-  {
-    // save the name of the only child so we can get a normal data item from it
-    mPath = childPath;
-  }
-
   return children;
 }
 
@@ -1361,7 +1353,6 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString filePath, QS
 {
   QSettings settings;
   QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
-  QString vsiPath = path;
   int zipFileCount = 0;
   QStringList zipFileList;
   QFileInfo fileInfo( filePath );
@@ -1416,14 +1407,21 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString filePath, QS
   // if 1 or 0 child found, create a single data item using the normal path or the full path given by QgsZipItem
   else
   {
+    QString vsiPath = vsiPrefix + filePath;
     if ( zipItem )
     {
-      vsiPath = zipItem->path();
+      if ( zipItem->children().size() == 1 )
+      {
+        // take the name of the only child so we can get a normal data item from it
+        QgsLayerItem *layerItem = qobject_cast<QgsLayerItem*>( zipItem->children().first() );
+        if ( layerItem )
+          vsiPath = layerItem->uri();
+      }
       zipFileCount = zipFileList.count();
       delete zipItem;
     }
 
-    QgsDebugMsgLevel( QString( "will try to create a normal dataItem from path= %2 or %3" ).arg( path ).arg( vsiPath ), 3 );
+    QgsDebugMsgLevel( QString( "will try to create a normal dataItem from filePath= %2 or vsiPath = %3" ).arg( filePath ).arg( vsiPath ), 3 );
 
     // try to open using registered providers (gdal and ogr)
     for ( int i = 0; i < mProviderNames.size(); i++ )
@@ -1437,7 +1435,7 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString filePath, QS
         // (e.g. testZipItemVectorTransparency(), second test)
         if (( mProviderNames[i] == "ogr" ) ||
             ( mProviderNames[i] == "gdal" && zipFileCount == 1 ) )
-          item = dataItem( path, parent );
+          item = dataItem( filePath, parent );
         // try with /vsizip/
         if ( ! item )
           item = dataItem( vsiPath, parent );
diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp
@@ -228,11 +228,14 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
     if ( !thePath.startsWith( vsiPrefix ) )
       thePath = vsiPrefix + thePath;
     // if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name
+    // no need to change the name I believe
+    /*
     if (( is_vsizip || is_vsitar ) && ( thePath != vsiPrefix + parentItem->path() ) )
     {
       name = thePath;
       name = name.replace( vsiPrefix + parentItem->path() + "/", "" );
     }
+    */
   }
 
   // return item without testing if:
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -326,11 +326,14 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
     if ( !thePath.startsWith( vsiPrefix ) )
       thePath = vsiPrefix + thePath;
     // if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name
+    // no need to change the name I believe
+    /*
     if (( is_vsizip || is_vsitar ) && ( thePath != vsiPrefix + parentItem->path() ) )
     {
       name = thePath;
       name = name.replace( vsiPrefix + parentItem->path() + "/", "" );
     }
+    */
   }
 
   // return item without testing if:

Original file line number	Diff line number	Diff line change
`@@ -228,11 +228,14 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )`
`228`	`228`	`if ( !thePath.startsWith( vsiPrefix ) )`
`229`	`229`	`thePath = vsiPrefix + thePath;`
`230`	`230`	`// if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name`
	`231`	`+ // no need to change the name I believe`
	`232`	`+ /*`
`231`	`233`	`if (( is_vsizip \|\| is_vsitar ) && ( thePath != vsiPrefix + parentItem->path() ) )`
`232`	`234`	`{`
`233`	`235`	`name = thePath;`
`234`	`236`	`name = name.replace( vsiPrefix + parentItem->path() + "/", "" );`
`235`	`237`	`}`
	`238`	`+ */`
`236`	`239`	`}`
`237`	`240`
`238`	`241`	`// return item without testing if:`
Original file line number	Diff line number	Diff line change
`@@ -326,11 +326,14 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )`
`326`	`326`	`if ( !thePath.startsWith( vsiPrefix ) )`
`327`	`327`	`thePath = vsiPrefix + thePath;`
`328`	`328`	`// if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name`
	`329`	`+ // no need to change the name I believe`
	`330`	`+ /*`
`329`	`331`	`if (( is_vsizip \|\| is_vsitar ) && ( thePath != vsiPrefix + parentItem->path() ) )`
`330`	`332`	`{`
`331`	`333`	`name = thePath;`
`332`	`334`	`name = name.replace( vsiPrefix + parentItem->path() + "/", "" );`
`333`	`335`	`}`
	`336`	`+ */`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`// return item without testing if:`