[GRASS-SVN] r32549 - grass/branches/develbranch_6/vector/v.in.dxf

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-05 17:32:52 -0400 (Tue, 05 Aug 2008)
New Revision: 32549

Modified:
   grass/branches/develbranch_6/vector/v.in.dxf/write_vect.c
Log:
v.in.dxf: messages standardization, merge from trunk, r32446


Modified: grass/branches/develbranch_6/vector/v.in.dxf/write_vect.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.dxf/write_vect.c	2008-08-05 21:06:13 UTC (rev 32548)
+++ grass/branches/develbranch_6/vector/v.in.dxf/write_vect.c	2008-08-05 21:32:52 UTC (rev 32549)
@@ -55,7 +55,7 @@
 
 	db_set_string(&sql, buf);
 	if (db_execute_immediate(driver, &sql) != DB_OK)
-	    G_fatal_error(_("Cannot execute: %s"), db_get_string(&sql));
+	    G_fatal_error(_("Unable to insert new record: %s"), db_get_string(&sql));
 	db_free_string(&sql);
     }
     else
@@ -184,7 +184,7 @@
 					  Vect_subst_var(Fi[i]->database,
 							 Map));
 	if (!driver)
-	    G_fatal_error(_("Cannot open database %s by driver %s"),
+	    G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
 			  Vect_subst_var(Fi[i]->database, Map),
 			  Fi[i]->driver);
 
@@ -204,18 +204,20 @@
     db_set_string(&sql, buf);
 
     if (db_execute_immediate(driver, &sql) != DB_OK)
-	G_fatal_error(_("Cannot create table: %s"), db_get_string(&sql));
+	G_fatal_error(_("Unable to create table: %s"), db_get_string(&sql));
     db_free_string(&sql);
 
     if (db_grant_on_table
 	(driver, Fi[i]->table, DB_PRIV_SELECT, DB_GROUP | DB_PUBLIC) != DB_OK)
-	G_fatal_error(_("Cannot grant privileges on table %s"), Fi[i]->table);
+	G_fatal_error(_("Unable to grant privileges on table <%s>"), Fi[i]->table);
     if (db_create_index2(driver, Fi[i]->table, Fi[i]->key) != DB_OK)
-	G_warning(_("Cannot create index"));
+	G_warning(_("Unable to create index for table <%s>, key <%s>"),
+		  Fi[i]->table, Fi[i]->key);
 
     if (Vect_map_add_dblink(Map, *field, field_name, Fi[i]->table, "cat",
 			    Fi[i]->database, Fi[i]->driver))
-	G_warning(_("Cannot link table: %s"), Fi[i]->table);
+	G_warning(_("Unable to add database link for vector map <%s>"),
+		  Vect_get_full_name(Map));
 
     return i;
 }