[GRASS-SVN] r44203 - grass/branches/releasebranch_6_4/vector/v.to.db

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-06 16:04:58 -0700 (Sat, 06 Nov 2010)
New Revision: 44203

Modified:
   grass/branches/releasebranch_6_4/vector/v.to.db/parse.c
Log:
v.to.db: start/end requires at least two columns - #1208
(merge r44201 from trunk)


Modified: grass/branches/releasebranch_6_4/vector/v.to.db/parse.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.to.db/parse.c	2010-11-06 23:02:14 UTC (rev 44202)
+++ grass/branches/releasebranch_6_4/vector/v.to.db/parse.c	2010-11-06 23:04:58 UTC (rev 44203)
@@ -145,7 +145,10 @@
     }
 
     if (!options.print) {
-	if (options.option == O_AREA || options.option == O_LENGTH || options.option == O_COUNT || options.option == O_QUERY || options.option == O_COMPACT || options.option == O_FD || options.option == O_PERIMETER || options.option == O_SLOPE || options.option == O_SINUOUS || options.option == O_AZIMUTH) {	/* one column required */
+	if (options.option == O_AREA || options.option == O_LENGTH || options.option == O_COUNT ||
+	    options.option == O_QUERY || options.option == O_COMPACT || options.option == O_FD ||
+	    options.option == O_PERIMETER || options.option == O_SLOPE || options.option == O_SINUOUS ||
+	    options.option == O_AZIMUTH) {	/* one column required */
 	    if (ncols != 1) {
 		G_fatal_error(_("This option requires one column"));
 	    }
@@ -155,7 +158,7 @@
 		G_fatal_error(_("This option requires two columns"));
 	    }
 	}
-	else if (options.option == O_COOR) {
+	else if (options.option == O_COOR || options.option == O_START || options.option == O_END) {
 	    if (ncols < 2) {
 		G_fatal_error(_("This option requires at least two columns"));
 	    }