[GRASS-SVN] r56381 - grass/trunk/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-05-23 08:21:33 -0700 (Thu, 23 May 2013)
New Revision: 56381

Modified:
   grass/trunk/lib/vector/Vlib/write_pg.c
Log:
vlib: write_line_sf() - clarify message (skipping features)


Modified: grass/trunk/lib/vector/Vlib/write_pg.c
===================================================================
--- grass/trunk/lib/vector/Vlib/write_pg.c	2013-05-23 15:16:24 UTC (rev 56380)
+++ grass/trunk/lib/vector/Vlib/write_pg.c	2013-05-23 15:21:33 UTC (rev 56381)
@@ -561,7 +561,6 @@
         dbString dbtable_name;
         dbHandle handle;
         dbDriver *driver;
-        dbCursor cursor;
         dbTable *table;
         dbColumn *column;
 
@@ -1057,26 +1056,31 @@
     /* determine matching PostGIS feature geometry type */
     if (type & (GV_POINT | GV_KERNEL)) {
         if (sf_type != SF_POINT && sf_type != SF_POINT25D) {
-            G_warning(_("Feature is not a point. Skipping."));
-            return -1;
+            G_warning(_("Point skipped (output feature type: %s)"),
+                      Vect_get_finfo_geometry_type(Map));
+            return 0;
         }
     }
     else if (type & GV_LINE) {
         if (sf_type != SF_LINESTRING && sf_type != SF_LINESTRING25D) {
-            G_warning(_("Feature is not a line. Skipping."));
-            return -1;
+            G_warning(_("Line skipped (output feature type: %s)"),
+                      Vect_get_finfo_geometry_type(Map));
+            return 0;
         }
     }
     else if (type & GV_BOUNDARY || type & GV_CENTROID) {
         if (sf_type != SF_POLYGON) {
+            G_warning(_("Boundary/centroid skipped (output feature type: %s)"),
+                      Vect_get_finfo_geometry_type(Map));
             G_warning(_("Feature is not a polygon. Skipping."));
-            return -1;
+            return 0;
         }
     }
     else if (type & GV_FACE) {
         if (sf_type != SF_POLYGON25D) {
-            G_warning(_("Feature is not a face. Skipping."));
-            return -1;
+            G_warning(_("Face skipped (output feature type: %s)"),
+                      Vect_get_finfo_geometry_type(Map));
+            return 0;
         }
     }
     else {