[GRASS-SVN] r38791 - in grass/trunk: db/db.select gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-08-19 04:46:42 -0400 (Wed, 19 Aug 2009)
New Revision: 38791

Modified:
   grass/trunk/db/db.select/main.c
   grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
Log:
verbose confirmation; fix Verify (merge from devbr6)

Modified: grass/trunk/db/db.select/main.c
===================================================================
--- grass/trunk/db/db.select/main.c	2009-08-19 08:39:25 UTC (rev 38790)
+++ grass/trunk/db/db.select/main.c	2009-08-19 08:46:42 UTC (rev 38791)
@@ -84,6 +84,9 @@
 	}
     }
 
+    if(parms.test_only)
+	G_verbose_message(_("Test %s."), stat ? _("failed") : _("succeeded"));
+
     db_close_database(driver);
     db_shutdown_driver(driver);
 
@@ -257,6 +260,7 @@
 	parms.h = 1;
     else
 	parms.h = 0;
+
     parms.test_only = flag_test->answer;
 
     if (!parms.fs)

Modified: grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py	2009-08-19 08:39:25 UTC (rev 38790)
+++ grass/trunk/gui/wxpython/gui_modules/sqlbuilder.py	2009-08-19 08:46:42 UTC (rev 38791)
@@ -320,7 +320,7 @@
                 pass
     def OnVerify(self,event):
         if self.text_sql.GetValue():
-            if os.system("""!db.select -t driver=%s database="%s" sql="SELECT * FROM %s WHERE %s" """ % \
+            if os.system("""db.select -t --verbose driver=%s database="%s" sql="SELECT * FROM %s WHERE %s" """ % \
                     (self.driver, self.database,self.tablename,
                         self.text_sql.GetValue().strip().replace("\n"," "))):
                 # FIXME: LOG