[GRASS-SVN] r58285 - grass/trunk/vector/v.what.rast

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-11-22 17:26:16 -0800 (Fri, 22 Nov 2013)
New Revision: 58285

Modified:
   grass/trunk/vector/v.what.rast/main.c
Log:
vector map does not need to be in the current mapset if the print flag is used (r58265 broke it for vect maps in the search path given without an explicit @mapset part); only report DB select count when DB is used

Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c	2013-11-22 19:31:43 UTC (rev 58284)
+++ grass/trunk/vector/v.what.rast/main.c	2013-11-23 01:26:16 UTC (rev 58285)
@@ -120,7 +120,10 @@
 
     /* Open vector */
     Vect_set_open_level(2);
-    Vect_open_old2(&Map, opt.vect->answer, G_mapset(), opt.field->answer);
+    if (print_flag->answer)
+	Vect_open_old2(&Map, opt.vect->answer, "", opt.field->answer);
+    else
+	Vect_open_old2(&Map, opt.vect->answer, G_mapset(), opt.field->answer);
 
     field = Vect_get_field_number(&Map, opt.field->answer);
 
@@ -632,15 +635,14 @@
     }
 
     /* Report */
-    G_verbose_message(_("%d categories loaded from table"), select);
     G_verbose_message(_("%d categories loaded from vector"), point_cnt);
-    if (!print_flag->answer)
-	G_verbose_message(_("%d categories from vector missing in table"),
-			  norec_cnt);
     if (dupl_cnt > 0)
 	G_message(_("%d duplicate categories in vector"), dupl_cnt);
 
     if (!print_flag->answer) {
+	G_verbose_message(_("%d categories loaded from table"), select);
+	G_verbose_message(_("%d categories from vector missing in table"),
+			  norec_cnt);
 	if (upderr_cnt > 0)
 	    G_warning(_("%d update errors"), upderr_cnt);