[GRASS-SVN] r34593 - in grass/trunk/vector: v.build.polylines v.category v.clean v.kcv v.net v.proj v.transform v.type

[svn_grass at osgeo.org]

Author: marisn
Date: 2008-11-28 04:30:14 -0500 (Fri, 28 Nov 2008)
New Revision: 34593

Modified:
   grass/trunk/vector/v.build.polylines/main.c
   grass/trunk/vector/v.category/main.c
   grass/trunk/vector/v.clean/main.c
   grass/trunk/vector/v.kcv/main.c
   grass/trunk/vector/v.net/main.c
   grass/trunk/vector/v.proj/main.c
   grass/trunk/vector/v.transform/main.c
   grass/trunk/vector/v.type/main.c
Log:
Print warning if copying attribute table to new vector map fails (merge from devbr6 r34592)

Modified: grass/trunk/vector/v.build.polylines/main.c
===================================================================
--- grass/trunk/vector/v.build.polylines/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.build.polylines/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -204,7 +204,8 @@
 
     /* Copy (all linked) tables if needed */
     if (write_cats != NO_CATS) {
-	Vect_copy_tables(&map, &Out, 0);
+        if (Vect_copy_tables(&map, &Out, 0))
+            G_warning(_("Failed to copy attribute table to output map"));
     }
 
     /* Tidy up */

Modified: grass/trunk/vector/v.category/main.c
===================================================================
--- grass/trunk/vector/v.category/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.category/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -482,7 +482,8 @@
 
     if (option == O_ADD || option == O_DEL || option == O_CHFIELD ||
 	option == O_SUM) {
-	Vect_copy_tables(&In, &Out, 0);
+        if (Vect_copy_tables(&In, &Out, 0))
+            G_warning(_("Failed to copy attribute table to output map"));
 	Vect_build(&Out);
 	Vect_close(&Out);
     }

Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.clean/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -271,7 +271,8 @@
 
     /* This works for both level 1 and 2 */
     Vect_copy_map_lines(&In, &Out);
-    Vect_copy_tables(&In, &Out, 0);
+    if (Vect_copy_tables(&In, &Out, 0))
+        G_warning(_("Failed to copy attribute table to output map"));
 
     Vect_set_release_support(&In);
     Vect_close(&In);

Modified: grass/trunk/vector/v.kcv/main.c
===================================================================
--- grass/trunk/vector/v.kcv/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.kcv/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -152,7 +152,8 @@
     Vect_copy_map_lines(&In, &Out);
 
     /* Copy tables */
-    Vect_copy_tables(&In, &Out, 0);
+    if (Vect_copy_tables(&In, &Out, 0))
+        G_warning(_("Failed to copy attribute table to output map"));
 
     /* Add column */
     db_init_string(&sql);

Modified: grass/trunk/vector/v.net/main.c
===================================================================
--- grass/trunk/vector/v.net/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.net/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -182,7 +182,8 @@
 	    Vect_close(&Points);
 	}
 
-	Vect_copy_tables(&In, &Out, 0);
+        if (Vect_copy_tables(&In, &Out, 0))
+            G_warning(_("Failed to copy attribute table to output map"));
 
 	/* support */
 	Vect_build_partial(&Out, GV_BUILD_NONE);

Modified: grass/trunk/vector/v.proj/main.c
===================================================================
--- grass/trunk/vector/v.proj/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.proj/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -275,7 +275,8 @@
     fprintf(stderr, "\r");
 
     /* Copy tables */
-    Vect_copy_tables(&Map, &Out_Map, 0);
+    if (Vect_copy_tables(&Map, &Out_Map, 0))
+        G_warning(_("Failed to copy attribute table to output map"));
 
     Vect_close(&Map);
 

Modified: grass/trunk/vector/v.transform/main.c
===================================================================
--- grass/trunk/vector/v.transform/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.transform/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -336,7 +336,8 @@
 			 ztozero, trans_params,
 			 table->answer, columns_name, atoi(field->answer));
 
-    Vect_copy_tables(&Old, &New, 0);
+    if (Vect_copy_tables(&Old, &New, 0))
+        G_warning(_("Failed to copy attribute table to output map"));
     Vect_close(&Old);
     Vect_build(&New);
 

Modified: grass/trunk/vector/v.type/main.c
===================================================================
--- grass/trunk/vector/v.type/main.c	2008-11-28 09:22:16 UTC (rev 34592)
+++ grass/trunk/vector/v.type/main.c	2008-11-28 09:30:14 UTC (rev 34593)
@@ -225,7 +225,8 @@
 	Vect_write_line(&Out, type, Points, Cats);
     }
 
-    Vect_copy_tables(&In, &Out, 0);
+    if (Vect_copy_tables(&In, &Out, 0))
+        G_warning(_("Failed to copy attribute table to output map"));
     Vect_build(&Out);
     Vect_close(&Out);
     Vect_close(&In);