[QGIS Commit] r9112 - trunk/qgis/src/plugins/spit

[svn_qgis at osgeo.org]

Author: jef
Date: 2008-08-21 18:26:35 -0400 (Thu, 21 Aug 2008)
New Revision: 9112

Modified:
   trunk/qgis/src/plugins/spit/qgsshapefile.cpp
   trunk/qgis/src/plugins/spit/qgsspit.cpp
Log:
fix #1230

Modified: trunk/qgis/src/plugins/spit/qgsshapefile.cpp
===================================================================
--- trunk/qgis/src/plugins/spit/qgsshapefile.cpp	2008-08-21 22:24:27 UTC (rev 9111)
+++ trunk/qgis/src/plugins/spit/qgsshapefile.cpp	2008-08-21 22:26:35 UTC (rev 9112)
@@ -80,7 +80,7 @@
   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();

Modified: trunk/qgis/src/plugins/spit/qgsspit.cpp
===================================================================
--- trunk/qgis/src/plugins/spit/qgsspit.cpp	2008-08-21 22:24:27 UTC (rev 9111)
+++ trunk/qgis/src/plugins/spit/qgsspit.cpp	2008-08-21 22:26:35 UTC (rev 9112)
@@ -561,7 +561,7 @@
 
       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";
       }
@@ -645,7 +645,8 @@
       }
 
       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() );