Skip to content

Commit

Permalink
fix #1230
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9112 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Aug 21, 2008
1 parent 5b26cc2 commit 575c97f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/plugins/spit/qgsshapefile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ bool QgsShapeFile::scanGeometries()
QProgressDialog *sg = new QProgressDialog();
sg->setMinimum(0);
sg->setMaximum(0);
QString label = "Scanning ";
QString label = tr("Scanning ");
label += filename;
sg->setLabel(new QLabel(label));
sg->show();
Expand Down
5 changes: 3 additions & 2 deletions src/plugins/spit/qgsspit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ void QgsSpit::import()

for ( std::vector<QString>::size_type k = 1; k < names_copy.size(); k++ )
{
QgsDebugMsg( tr("Checking to see if ") + names_copy[ k ] + " == " + names_copy[ k - 1 ] );
QgsDebugMsg( QString("Checking to see if %1 == %2").arg(names_copy[ k ]).arg( names_copy[ k - 1 ] ) );
if ( names_copy[ k ] == names_copy[ k - 1 ] )
dupl += names_copy[ k ] + "\n";
}
Expand Down Expand Up @@ -645,7 +645,8 @@ void QgsSpit::import()
}

query = "SET SEARCH_PATH TO ";
if ( tblShapefiles->item( i, ColDBSCHEMA )->text() != "public" )
if ( !tblShapefiles->item( i, ColDBSCHEMA )->text().isEmpty() &&
tblShapefiles->item( i, ColDBSCHEMA )->text() != "public")
query += QgsPgUtil::quotedValue( tblShapefiles->item( i, ColDBSCHEMA )->text() ) + ",";
query += QgsPgUtil::quotedValue( "public" );
res = PQexec( conn, query.toUtf8() );
Expand Down

0 comments on commit 575c97f

Please sign in to comment.