[GRASS-SVN] r48579 - grass/trunk/vector/v.in.lidar

[svn_grass at osgeo.org]

Author: mmetz
Date: 2011-10-01 00:31:11 -0700 (Sat, 01 Oct 2011)
New Revision: 48579

Modified:
   grass/trunk/vector/v.in.lidar/main.c
Log:
v.in.lidar: improve no import handling

Modified: grass/trunk/vector/v.in.lidar/main.c
===================================================================
--- grass/trunk/vector/v.in.lidar/main.c	2011-10-01 07:30:09 UTC (rev 48578)
+++ grass/trunk/vector/v.in.lidar/main.c	2011-10-01 07:31:11 UTC (rev 48579)
@@ -217,6 +217,7 @@
     no_import_flag->description =
 	_("Create the location specified by the \"location\" parameter and exit."
           " Do not import the vector file.");
+    no_import_flag->suppress_required = YES;
 
     notopo_flag = G_define_flag();
     notopo_flag->key = 'b';
@@ -266,17 +267,6 @@
 	exit(EXIT_SUCCESS);
     }
 
-    if (!outloc_opt->answer) {	/* Check if the map exists */
-	if (G_find_vector2(out_opt->answer, G_mapset())) {
-	    if (overwrite)
-		G_warning(_("Vector map <%s> already exists and will be overwritten"),
-			  out_opt->answer);
-	    else
-		G_fatal_error(_("Vector map <%s> already exists"),
-			      out_opt->answer);
-	}
-    }
-
     return_filter = LAS_ALL;
     if (filter_opt->answer) {
 	if (strcmp(filter_opt->answer, "first") == 0)
@@ -478,6 +468,17 @@
     db_init_string(&sql);
     db_init_string(&strval);
 
+    if (!outloc_opt->answer) {	/* Check if the map exists */
+	if (G_find_vector2(out_opt->answer, G_mapset())) {
+	    if (overwrite)
+		G_warning(_("Vector map <%s> already exists and will be overwritten"),
+			  out_opt->answer);
+	    else
+		G_fatal_error(_("Vector map <%s> already exists"),
+			      out_opt->answer);
+	}
+    }
+
     /* open output vector */
     sprintf(buf, "%s", out_opt->answer);
     /* strip any @mapset from vector output name */