[GRASS-SVN] r59912 - in grass/branches/releasebranch_7_0/vector: v.db.connect v.in.db v.transform

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-04-23 12:38:01 -0700 (Wed, 23 Apr 2014)
New Revision: 59912

Modified:
   grass/branches/releasebranch_7_0/vector/v.db.connect/main.c
   grass/branches/releasebranch_7_0/vector/v.in.db/main.c
   grass/branches/releasebranch_7_0/vector/v.transform/trans_digit.c
Log:
v.*: column not found (clarify message)
     (merge r59911 from trunk)


Modified: grass/branches/releasebranch_7_0/vector/v.db.connect/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.db.connect/main.c	2014-04-23 19:34:23 UTC (rev 59911)
+++ grass/branches/releasebranch_7_0/vector/v.db.connect/main.c	2014-04-23 19:38:01 UTC (rev 59912)
@@ -285,7 +285,7 @@
 			db_get_column(driver, dbtable->answer, dbkey->answer,
 				      &column);
 			if (!column)
-			    G_fatal_error(_("Missing column <%s> in table <%s>"),
+			    G_fatal_error(_("Column <%s> not found in table <%s>"),
 					  dbkey->answer, dbtable->answer);
 
 			if (db_column_Ctype

Modified: grass/branches/releasebranch_7_0/vector/v.in.db/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.in.db/main.c	2014-04-23 19:34:23 UTC (rev 59911)
+++ grass/branches/releasebranch_7_0/vector/v.in.db/main.c	2014-04-23 19:38:01 UTC (rev 59912)
@@ -149,7 +149,7 @@
         coltype = db_column_Ctype(driver, table_opt->answer, keycol_opt->answer);
 
         if (coltype == -1)
-            G_fatal_error(_("Missing column <%s> in table <%s>"),
+            G_fatal_error(_("Column <%s> not found in table <%s>"),
                           keycol_opt->answer, table_opt->answer);
         if (coltype != DB_C_TYPE_INT)
             G_fatal_error(_("Data type of key column must be integer"));

Modified: grass/branches/releasebranch_7_0/vector/v.transform/trans_digit.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.transform/trans_digit.c	2014-04-23 19:34:23 UTC (rev 59911)
+++ grass/branches/releasebranch_7_0/vector/v.transform/trans_digit.c	2014-04-23 19:38:01 UTC (rev 59912)
@@ -98,7 +98,7 @@
 		    case DB_C_TYPE_STRING:
 			break;
 		    case -1:
-			G_fatal_error(_("Missing column <%s> in table <%s>"),
+			G_fatal_error(_("Column <%s> not found in table <%s>"),
 				      columns[j], fi->table);
 		    default:
 			G_fatal_error(_("Unsupported column type of <%s>"),