sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix .qml file loading in /vsigzip and /vsizip items

Browse Source
This commit is contained in:
Etienne Tourigny 2012-04-24 21:41:50 -03:00
parent 66e3fcb6f3
commit 2bd054c8e0
11 changed files with 204 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
python/core/qgsmaplayer.sip
View File

@ -181,7 +181,7 @@ public:
void removeCustomProperty( const QString& key );
/** Read the symbology for the current layer from the Dom node supplied.
* @param QDomNode node that will contain the symbology definition for this layer.
* @param node node that will contain the symbology definition for this layer.
* @param errorMessage reference to string that will be updated with any error messages
* @return true in case of success.
*/
@ -244,10 +244,19 @@ public:
/** A convenience function to capitalise the layer name */
static QString capitaliseLayerName(const QString name);
/** Retrieve the default style for this layer if one
/** Retrieve the style URI for this layer
* (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @return a QString withe the style file name
* @see also loadNamedStyle () and saveNamedStyle ();
* @note This method was added in QGIS 1.8
*/
virtual QString styleURI( );
/** Retrieve the default style for this layer if one
* exists (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @param a reference to a flag that will be set to false if
* @param theResultFlag a reference to a flag that will be set to false if
* we did not manage to load the default style.
* @return a QString with any status messages
* @see also loadNamedStyle ();
@ -257,12 +266,12 @@ public:
/** Retrieve a named style for this layer if one
* exists (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @param QString theURI - the file name or other URI for the
* @param theURI - the file name or other URI for the
* style file. First an attempt will be made to see if this
* is a file and load that, if that fails the qgis.db styles
* table will be consulted to see if there is a style who's
* key matches the URI.
* @param a reference to a flag that will be set to false if
* @param theResultFlag a reference to a flag that will be set to false if
* we did not manage to load the default style.
* @return a QString with any status messages
* @see also loadDefaultStyle ();
@ -274,7 +283,7 @@ public:
/** Save the properties of this layer as the default style
* (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @param a reference to a flag that will be set to false if
* @param theResultFlag a reference to a flag that will be set to false if
* we did not manage to save the default style.
* @return a QString with any status messages
* @see also loadNamedStyle () and saveNamedStyle()
@ -284,12 +293,12 @@ public:
/** Save the properties of this layer as a named style
* (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @param QString theURI - the file name or other URI for the
* @param theURI - the file name or other URI for the
* style file. First an attempt will be made to see if this
* is a file and save to that, if that fails the qgis.db styles
* table will be used to create a style entry who's
* key matches the URI.
* @param a reference to a flag that will be set to false if
* @param theResultFlag a reference to a flag that will be set to false if
* we did not manage to save the default style.
* @return a QString with any status messages
* @see also saveDefaultStyle ();

43
src/core/qgsdataitem.cpp
View File

@ -469,8 +469,7 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
QString path = dir.absoluteFilePath( name );
QFileInfo fileInfo( path );
// vsizip support was added to GDAL/OGR 1.6 but this symbol not available here
// #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1600
// vsizip support was added to GDAL/OGR 1.6 but GDAL_VERSION_NUM not available here
if ( fileInfo.suffix() == "zip" && scanZip )
{
QgsDataItem * item = QgsZipItem::itemFromPath( this, path, name );
@ -480,7 +479,6 @@ QVector<QgsDataItem*> QgsDirectoryItem::createChildren( )
continue;
}
}
// #endif
foreach( QLibrary *library, mLibraries )
{
@ -780,13 +778,14 @@ QgsZipItem::~QgsZipItem()
QVector<QgsDataItem*> QgsZipItem::createChildren( )
{
QVector<QgsDataItem*> children;
QStringList zipFileList;
QString tmpPath;
QString childPath;
QSettings settings;
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
mZipFileList.clear();
QgsDebugMsg( QString( "path = %1 name= %2 scanZipSetting= %3" ).arg( path() ).arg( name() ).arg( scanZipSetting ) );
// if scanZipBrowser == 0 (No): skip to the next file
@ -804,7 +803,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
}
#endif
// if scanZipBrowser == 1 (Passthru): do not scan zip and allow to open directly with /vsigzip/
// if scanZipBrowser == 1 (Passthru): do not scan zip and allow to open directly with /vsizip/
if ( scanZipSetting == 1 )
{
mPath = "/vsizip/" + path(); // should check for extension
@ -827,10 +826,10 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
tmpPath = zip.getCurrentFileName();
// skip directories (files ending with /)
if ( tmpPath.right( 1 ) != "/" )
zipFileList << tmpPath;
mZipFileList << tmpPath;
}
zip.close();
}
zip.close();
if ( zip.getZipError() != UNZ_OK )
{
QgsDebugMsg( QString( "Zip error: %1" ).arg( zip.getZipError() ) );
@ -840,7 +839,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
#endif
// loop over files inside zip
foreach( QString fileName, zipFileList )
foreach( QString fileName, mZipFileList )
{
QFileInfo info( fileName );
tmpPath = "/vsizip/" + path() + "/" + fileName;
@ -854,7 +853,7 @@ QVector<QgsDataItem*> QgsZipItem::createChildren( )
{
if ( info.suffix() == "dbf" )
{
if ( zipFileList.indexOf( fileName.left( fileName.count() - 4 ) + ".shp" ) != -1 )
if ( mZipFileList.indexOf( fileName.left( fileName.count() - 4 ) + ".shp" ) != -1 )
continue;
}
if ( info.completeSuffix().toLower() == "shp.xml" )
@ -901,8 +900,9 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
QSettings settings;
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
QString vsizipPath = path;
int zipFileCount = 0;
QFileInfo fileInfo( path );
QString tmpPath = path;
QgsZipItem * zipItem = 0;
QgsDebugMsg( QString( "path = %1 name= %2 scanZipSetting= %3" ).arg( path ).arg( name ).arg( scanZipSetting ) );
@ -912,10 +912,10 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
{
return 0;
}
// if scanZipBrowser == 1 (Passthru): do not scan zip and allow to open directly with /vsigzip/
// if scanZipBrowser == 1 (Passthru): do not scan zip and allow to open directly with /vsizip/
else if ( scanZipSetting == 1 )
{
tmpPath = "/vsizip/" + path;
vsizipPath = "/vsizip/" + path;
zipItem = 0;
}
else
@ -937,16 +937,17 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
QgsDebugMsg( "returning zipItem" );
return zipItem;
}
// if 1 or 0 child found, create a data item using the full path given by QgsZipItem
// if 1 or 0 child found, create a single data item using the normal path or the full path given by QgsZipItem
else
{
if ( zipItem )
{
tmpPath = zipItem->path();
vsizipPath = zipItem->path();
zipFileCount = zipItem->getZipFileList().count();
delete zipItem;
}
QgsDebugMsg( QString( "will try to create a normal dataItem from path= %2" ).arg( tmpPath ) );
QgsDebugMsg( QString( "will try to create a normal dataItem from path= %2 or %3" ).arg( path ).arg( vsizipPath ) );
// try to open using registered providers (gdal and ogr)
for ( int i = 0; i < mProviderNames.size(); i++ )
@ -954,7 +955,17 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
dataItem_t *dataItem = mDataItemPtr[i];
if ( dataItem )
{
QgsDataItem *item = dataItem( tmpPath, parent );
QgsDataItem *item = 0;
// try first with normal path (Passthru)
// this is to simplify .qml handling, and without this some tests will fail
// (e.g. testZipItemVectorTransparency(), second test)
if (( scanZipSetting == 1 ) ||
( mProviderNames[i] == "ogr" ) ||
( mProviderNames[i] == "gdal" && zipFileCount == 1 ) )
item = dataItem( path, parent );
// try with /vsizip/
if ( ! item )
item = dataItem( vsizipPath, parent );
if ( item )
return item;
}

7
src/core/qgsdataitem.h
View File

@ -289,6 +289,10 @@ class CORE_EXPORT QgsFavouritesItem : public QgsDataCollectionItem
class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem
{
Q_OBJECT
protected:
QStringList mZipFileList;
public:
QgsZipItem( QgsDataItem* parent, QString name, QString path );
~QgsZipItem();
@ -302,6 +306,9 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem
static QgsDataItem* itemFromPath( QgsDataItem* parent, QString path, QString name );
static const QIcon &iconZip();
const QStringList & getZipFileList() const { return mZipFileList; }
};
#endif // QGSDATAITEM_H

42
src/core/qgsmaplayer.cpp
View File

@ -549,25 +549,57 @@ QString QgsMapLayer::capitaliseLayerName( const QString name )
return layerName;
}
QString QgsMapLayer::loadDefaultStyle( bool & theResultFlag )
QString QgsMapLayer::styleURI( )
{
QString myURI = publicSource();
// if file is using the /vsizip/ or /vsigzip/ mechanism, cleanup the name
if ( myURI.left( 9 ) == "/vsigzip/" )
{
myURI.remove( 1, 9 );
}
else if ( myURI.left( 8 ) == "/vsizip/" && myURI.right( 4 ) == ".zip" )
{
// ideally we should look for .qml file inside zip file
myURI.remove( 1, 8 );
}
QFileInfo myFileInfo( myURI );
QString key;
if ( myFileInfo.exists() )
{
// if file is using the /vsizip/ or /vsigzip/ mechanism, cleanup the name
if ( myURI.right( 3 ) == ".gz" )
{
myURI.chop( 3 );
myFileInfo.setFile( myURI );
}
else if ( myURI.right( 4 ) == ".zip" )
{
myURI.chop( 4 );
myFileInfo.setFile( myURI );
}
// get the file name for our .qml style file
key = myFileInfo.path() + QDir::separator() + myFileInfo.completeBaseName() + ".qml";
}
else
{
key = myURI;
key = publicSource();
}
return loadNamedStyle( key, theResultFlag );
return key;
}
QString QgsMapLayer::loadDefaultStyle( bool & theResultFlag )
{
return loadNamedStyle( styleURI(), theResultFlag );
}
bool QgsMapLayer::loadNamedStyleFromDb( const QString db, const QString theURI, QString &qml )
{
QgsDebugMsg( QString( "db = %1 uri = %2" ).arg( db ).arg( theURI ) );
bool theResultFlag = false;
// read from database
@ -610,6 +642,8 @@ bool QgsMapLayer::loadNamedStyleFromDb( const QString db, const QString theURI,
QString QgsMapLayer::loadNamedStyle( const QString theURI, bool &theResultFlag )
{
QgsDebugMsg( QString( "uri = %1 myURI = %2" ).arg( theURI ).arg( publicSource() ) );
theResultFlag = false;
QDomDocument myDocument( "qgis" );
@ -692,7 +726,7 @@ QString QgsMapLayer::loadNamedStyle( const QString theURI, bool &theResultFlag )
QString QgsMapLayer::saveDefaultStyle( bool & theResultFlag )
{
return saveNamedStyle( publicSource(), theResultFlag );
return saveNamedStyle( styleURI(), theResultFlag );
}
QString QgsMapLayer::saveNamedStyle( const QString theURI, bool & theResultFlag )

9
src/core/qgsmaplayer.h
View File

@ -237,6 +237,15 @@ class CORE_EXPORT QgsMapLayer : public QObject
/** A convenience function to capitalise the layer name */
static QString capitaliseLayerName( const QString name );
/** Retrieve the style URI for this layer
* (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)
* @return a QString withe the style file name
* @see also loadNamedStyle () and saveNamedStyle ();
* @note This method was added in QGIS 1.8
*/
virtual QString styleURI( );
/** Retrieve the default style for this layer if one
* exists (either as a .qml file on disk or as a
* record in the users style table in their personal qgis.db)

7
src/core/qgsvectorlayer.cpp
View File

@ -2844,6 +2844,13 @@ bool QgsVectorLayer::setDataProvider( QString const & provider )
// make sure that the "observer" has been removed from URI to avoid crashes
mDataSource = mDataProvider->dataSourceUri();
}
else if ( provider == "ogr" )
{
// make sure that the /vsigzip or /vsizip is added to uri, if applicable
mDataSource = mDataProvider->dataSourceUri();
if ( mDataSource.right( 10 ) == "|layerid=0" )
mDataSource.chop( 10 );
}
// label
mLabel = new QgsLabel( mDataProvider->fields() );

6
src/core/raster/qgsrasterlayer.cpp
View File

@ -2278,6 +2278,12 @@ void QgsRasterLayer::setDataProvider( QString const & provider,
return;
}
if ( provider == "gdal" )
{
// make sure that the /vsigzip or /vsizip is added to uri, if applicable
mDataSource = mDataProvider->dataSourceUri();
}
mDataProvider->addLayers( layers, styles );
mDataProvider->setImageEncoding( format );
mDataProvider->setImageCrs( theCrs );

78
src/providers/gdal/qgsgdaldataitems.cpp
View File

@ -105,20 +105,29 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
if ( thePath.isEmpty() )
return 0;
QgsDebugMsg( "thePath= " + thePath );
QString uri = thePath;
QFileInfo info( thePath );
// zip settings + info
QSettings settings;
//extract basename with extension
QString name = info.fileName();
int scanItemsSetting = settings.value( "/qgis/scanItemsInBrowser", 0 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
bool is_vsizip = ( thePath.startsWith( "/vsizip/" ) ||
thePath.endsWith( ".zip", Qt::CaseInsensitive ) );
bool is_vsigzip = ( thePath.startsWith( "/vsigzip/" ) ||
thePath.endsWith( ".gz", Qt::CaseInsensitive ) );
// allow normal files or VSIFILE items to pass
if ( !info.isFile() &&
!thePath.startsWith( "/vsizip/" ) &&
!thePath.startsWith( "/vsigzip/" ) )
// get suffix, removing .gz if present
QString tmpPath = thePath; //path used for testing, not for layer creation
if ( is_vsigzip )
tmpPath.chop( 3 );
QFileInfo info( tmpPath );
QString suffix = info.suffix().toLower();
// extract basename with extension
info.setFile( thePath );
QString name = info.fileName();
QgsDebugMsg( "thePath= " + thePath + " tmpPath= " + tmpPath );
// allow only normal files or VSIFILE items to continue
if ( !info.isFile() && !is_vsizip && !is_vsigzip )
return 0;
// get supported extensions
@ -132,7 +141,7 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
// skip *.aux.xml files (GDAL auxilary metadata files)
// unless that extension is in the list (*.xml might be though)
if ( thePath.endsWith( ".aux.xml", Qt::CaseInsensitive ) &&
! extensions.contains( "aux.xml" ) )
!extensions.contains( "aux.xml" ) )
return 0;
// skip .tar.gz files
@ -156,48 +165,43 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
return 0;
}
// vsifile : depending on options we should just add the item without testing
if ( thePath.startsWith( "/vsizip/" ) )
// add /vsizip/ or /vsigzip/ to path if file extension is .zip or .gz
if ( is_vsigzip )
{
// if this is a /vsigzip/path.zip/file_inside_zip change the name
if ( !thePath.startsWith( "/vsigzip/" ) )
thePath = "/vsigzip/" + thePath;
}
else if ( is_vsizip )
{
if ( !thePath.startsWith( "/vsizip/" ) )
thePath = "/vsizip/" + thePath;
// if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name
if ( thePath != "/vsizip/" + parentItem->path() )
{
name = thePath;
name = name.replace( "/vsizip/" + parentItem->path() + "/", "" );
}
// if setting = 2 (Basic scan), return an item without testing
if ( scanZipSetting == 2 )
{
QStringList sublayers;
QgsDebugMsg( QString( "adding item name=%1 thePath=%2 uri=%3" ).arg( name ).arg( thePath ).arg( uri ) );
QgsLayerItem * item = new QgsGdalLayerItem( parentItem, name, thePath, thePath, &sublayers );
if ( item )
return item;
}
}
// if scan items == "Check extension", add item here without trying to open
if ( scanItemsSetting == 1 )
// if setting = 2 (Basic scan), return a /vsizip/ item without testing
if ( is_vsizip && scanZipSetting == 2 )
{
QStringList sublayers;
QgsDebugMsg( QString( "adding item name=%1 thePath=%2 uri=%3" ).arg( name ).arg( thePath ).arg( uri ) );
QgsDebugMsg( QString( "adding item name=%1 thePath=%2" ).arg( name ).arg( thePath ) );
QgsLayerItem * item = new QgsGdalLayerItem( parentItem, name, thePath, thePath, &sublayers );
if ( item )
return item;
}
// try to open using VSIFileHandler
if ( thePath.endsWith( ".zip", Qt::CaseInsensitive ) )
// if scan items == "Check extension", add item here without trying to open
// unless item is /vsizip
if ( scanItemsSetting == 1 && !is_vsizip )
{
if ( !thePath.startsWith( "/vsizip/" ) )
thePath = "/vsizip/" + thePath;
}
else if ( thePath.endsWith( ".gz", Qt::CaseInsensitive ) )
{
if ( !thePath.startsWith( "/vsigzip/" ) )
thePath = "/vsigzip/" + thePath;
QStringList sublayers;
QgsDebugMsg( QString( "adding item name=%1 thePath=%2" ).arg( name ).arg( thePath ) );
QgsLayerItem * item = new QgsGdalLayerItem( parentItem, name, thePath, thePath, &sublayers );
if ( item )
return item;
}
// test that file is valid with GDAL

4
src/providers/gdal/qgsgdalprovider.cpp
View File

@ -1872,13 +1872,17 @@ QGISEXTERN bool isValidRasterFileName( QString const & theFileNameQString, QStri
if ( fileName.endsWith( ".zip", Qt::CaseInsensitive ) )
{
if ( !fileName.startsWith( "/vsizip/" ) )
{
fileName = "/vsizip/" + fileName;
}
QgsDebugMsg( QString( "Trying /vsizip syntax, fileName= %1" ).arg( fileName ) );
}
if ( fileName.endsWith( ".gz", Qt::CaseInsensitive ) )
{
if ( !fileName.startsWith( "/vsigzip/" ) )
{
fileName = "/vsigzip/" + fileName;
}
QgsDebugMsg( QString( "Trying /vsigzip syntax, fileName= %1" ).arg( fileName ) );
}

75
src/providers/ogr/qgsogrdataitems.cpp
View File

@ -228,31 +228,42 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
QgsDebugMsg( "thePath: " + thePath );
QFileInfo info( thePath );
QString name = info.fileName();
// zip settings + info
QSettings settings;
int scanItemsSetting = settings.value( "/qgis/scanItemsInBrowser", 0 ).toInt();
int scanZipSetting = settings.value( "/qgis/scanZipInBrowser", 1 ).toInt();
bool is_vsizip = ( thePath.startsWith( "/vsizip/" ) ||
thePath.endsWith( ".zip", Qt::CaseInsensitive ) );
bool is_vsigzip = ( thePath.startsWith( "/vsigzip/" ) ||
thePath.endsWith( ".gz", Qt::CaseInsensitive ) );
// allow normal files or VSIFILE items to pass
if ( !info.isFile() &&
!thePath.startsWith( "/vsizip/" ) &&
!thePath.startsWith( "/vsigzip/" ) )
// get suffix, removing .gz if present
QString tmpPath = thePath; //path used for testing, not for layer creation
if ( is_vsigzip )
tmpPath.chop( 3 );
QFileInfo info( tmpPath );
QString suffix = info.suffix().toLower();
// extract basename with extension
info.setFile( thePath );
QString name = info.fileName();
// allow only normal files or VSIFILE items to continue
if ( !info.isFile() && !is_vsizip && !is_vsigzip )
return 0;
QStringList myExtensions = fileExtensions();
// skip *.aux.xml files (GDAL auxilary metadata files) and .shp.xml files (ESRI metadata)
// unless that extension is in the list (*.xml might be though)
if ( thePath.right( 8 ).toLower() == ".aux.xml" &&
myExtensions.indexOf( "aux.xml" ) < 0 )
if ( thePath.endsWith( ".aux.xml", Qt::CaseInsensitive ) &&
!myExtensions.contains( "aux.xml" ) )
return 0;
if ( thePath.right( 8 ).toLower() == ".shp.xml" &&
myExtensions.indexOf( "shp.xml" ) < 0 )
if ( thePath.endsWith( ".shp.xml", Qt::CaseInsensitive ) &&
!myExtensions.contains( "shp.xml" ) )
return 0;
// skip .tar.gz files
if ( thePath.right( 7 ) == ".tar.gz" )
if ( thePath.endsWith( ".tar.gz", Qt::CaseInsensitive ) )
return 0;
// We have to filter by extensions, otherwise e.g. all Shapefile files are displayed
@ -281,43 +292,41 @@ QGISEXTERN QgsDataItem * dataItem( QString thePath, QgsDataItem* parentItem )
return 0;
}
// vsifile : depending on options we should just add the item without testing
if ( thePath.startsWith( "/vsizip/" ) )
// add /vsizip/ or /vsigzip/ to path if file extension is .zip or .gz
if ( is_vsigzip )
{
// if this is a /vsigzip/path.zip/file_inside_zip change the name
if ( !thePath.startsWith( "/vsigzip/" ) )
thePath = "/vsigzip/" + thePath;
}
else if ( is_vsizip )
{
if ( !thePath.startsWith( "/vsizip/" ) )
thePath = "/vsizip/" + thePath;
// if this is a /vsigzip/path_to_zip.zip/file_inside_zip remove the full path from the name
if ( thePath != "/vsizip/" + parentItem->path() )
{
name = thePath;
name = name.replace( "/vsizip/" + parentItem->path() + "/", "" );
}
// if setting== 2 (Basic scan), return an item without testing
if ( scanZipSetting == 2 )
{
QgsLayerItem * item = new QgsOgrLayerItem( parentItem, name, thePath, thePath, QgsLayerItem::Vector );
if ( item )
return item;
}
}
// if scan items == "Check extension", add item here without trying to open
if ( scanItemsSetting == 1 )
// if setting = 2 (Basic scan), return a /vsizip/ item without testing
if ( is_vsizip && scanZipSetting == 2 )
{
QStringList sublayers;
QgsDebugMsg( QString( "adding item name=%1 thePath=%2" ).arg( name ).arg( thePath ) );
QgsLayerItem * item = new QgsOgrLayerItem( parentItem, name, thePath, thePath, QgsLayerItem::Vector );
if ( item )
return item;
}
// try to open using VSIFileHandler
if ( thePath.endsWith( ".zip", Qt::CaseInsensitive ) )
// if scan items == "Check extension", add item here without trying to open
// unless item is /vsizip
if ( scanItemsSetting == 1 && !is_vsizip && !is_vsigzip )
{
if ( !thePath.startsWith( "/vsizip/" ) )
thePath = "/vsizip/" + thePath;
}
else if ( thePath.endsWith( ".gz", Qt::CaseInsensitive ) )
{
if ( !thePath.startsWith( "/vsigzip/" ) )
thePath = "/vsigzip/" + thePath;
QgsLayerItem * item = new QgsOgrLayerItem( parentItem, name, thePath, thePath, QgsLayerItem::Vector );
if ( item )
return item;
}
// test that file is valid with OGR

6
src/providers/ogr/qgsogrprovider.cpp
View File

@ -270,13 +270,19 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
// cannot be interleaved, so for now just use read-only.
openReadOnly = true;
if ( !mFilePath.startsWith( "/vsizip/" ) )
{
mFilePath = "/vsizip/" + mFilePath;
setDataSourceUri( mFilePath );
}
QgsDebugMsg( QString( "Trying /vsizip syntax, mFilePath= %1" ).arg( mFilePath ) );
}
else if ( mFilePath.endsWith( ".gz", Qt::CaseInsensitive ) )
{
if ( !mFilePath.startsWith( "/vsigzip/" ) )
{
mFilePath = "/vsigzip/" + mFilePath;
setDataSourceUri( mFilePath );
}
QgsDebugMsg( QString( "Trying /vsigzip syntax, mFilePath= %1" ).arg( mFilePath ) );
}