[QGIS Commit] r9787 - trunk/qgis/src/providers/ogr

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-12-13 15:42:49 -0500 (Sat, 13 Dec 2008)
New Revision: 9787

Modified:
   trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
Log:
Applied patch #1295 from smizuno. Thanks!

Modified: trunk/qgis/src/providers/ogr/qgsogrprovider.cpp
===================================================================
--- trunk/qgis/src/providers/ogr/qgsogrprovider.cpp	2008-12-13 20:25:01 UTC (rev 9786)
+++ trunk/qgis/src/providers/ogr/qgsogrprovider.cpp	2008-12-13 20:42:49 UTC (rev 9787)
@@ -723,15 +723,11 @@
 
 bool QgsOgrProvider::createSpatialIndex()
 {
-  QString fileName = dataSourceUri().section( '/', -1, -1 );//find out the file name from the uri
-  QString layerName = fileName.section( '.', 0, 0 );
-  QString sql = "CREATE SPATIAL INDEX ON " + layerName;
-  OGR_DS_ExecuteSQL( ogrDataSource, sql.toAscii(), OGR_L_GetSpatialFilter( ogrLayer ), "" );
+  QFileInfo fi( dataSourceUri() );     // to get the base name
+  QString sql = QString( "CREATE SPATIAL INDEX ON %1" ).arg( quotedIdentifier( fi.completeBaseName() ) );  // quote the layer name so spaces are handled
+  OGR_DS_ExecuteSQL( ogrDataSource, mEncoding->fromUnicode( sql ).data(), OGR_L_GetSpatialFilter( ogrLayer ), "" );
   //find out, if the .qix file is there
-  QString indexname = dataSourceUri();
-  indexname.truncate( dataSourceUri().length() - fileName.length() );
-  indexname = indexname + layerName + ".qix";
-  QFile indexfile( indexname );
+  QFile indexfile( fi.path().append( "/").append( fi.completeBaseName() ).append( ".qix" ) );
   if ( indexfile.exists() )
   {
     return true;
@@ -753,11 +749,10 @@
     }
   }
 
-  OGR_L_SyncToDisk( ogrLayer );
-  QString fileName = dataSourceUri().section( '/', -1, -1 );//find out the file name from the uri
-  QString layerName = fileName.section( '.', 0, 0 );
-  QString sql = "REPACK " + layerName;
-  OGR_DS_ExecuteSQL( ogrDataSource, sql.toLocal8Bit().data(), NULL, NULL );
+  OGR_L_SyncToDisk( ogrLayer );  
+  QFileInfo fi( dataSourceUri() );     // to get the base name
+  QString sql = QString( "REPACK %1" ).arg( fi.completeBaseName() );   // don't quote the layer name as it works with spaces in the name and won't work if the name is quoted
+  OGR_DS_ExecuteSQL( ogrDataSource, mEncoding->fromUnicode( sql ).data(), NULL, NULL );
   featuresCounted = OGR_L_GetFeatureCount( ogrLayer, TRUE ); //new feature count
   return returnvalue;
 }
@@ -1177,7 +1172,7 @@
   }
 
   OGRLayerH layer;
-  layer = OGR_DS_CreateLayer( dataSource, QFile::encodeName( QFileInfo( uri ).baseName() ).constData(), reference, OGRvectortype, NULL );
+  layer = OGR_DS_CreateLayer( dataSource, QFile::encodeName( QFileInfo( uri ).completeBaseName() ).constData(), reference, OGRvectortype, NULL );
   if ( layer == NULL )
   {
     return false;
@@ -1268,7 +1263,7 @@
 
   QString sql = QString( "SELECT DISTINCT %1 FROM %2 ORDER BY %1" )
                 .arg( quotedIdentifier( fld.name() ) )
-                .arg( quotedIdentifier( fi.baseName() ) );
+                .arg( quotedIdentifier( fi.completeBaseName() ) );
 
   uniqueValues.clear();
 
@@ -1298,7 +1293,7 @@
 
   QString sql = QString( "SELECT MIN(%1) FROM %2" )
                 .arg( quotedIdentifier( fld.name() ) )
-                .arg( quotedIdentifier( fi.baseName() ) );
+                .arg( quotedIdentifier( fi.completeBaseName() ) );
 
   OGRLayerH l = OGR_DS_ExecuteSQL( ogrDataSource, mEncoding->fromUnicode( sql ).data(), NULL, "SQL" );
 
@@ -1329,7 +1324,7 @@
 
   QString sql = QString( "SELECT MAX(%1) FROM %2" )
                 .arg( quotedIdentifier( fld.name() ) )
-                .arg( quotedIdentifier( fi.baseName() ) );
+                .arg( quotedIdentifier( fi.completeBaseName() ) );
 
   OGRLayerH l = OGR_DS_ExecuteSQL( ogrDataSource, mEncoding->fromUnicode( sql ).data(), NULL, "SQL" );
   if ( l == 0 )