Przeglądaj źródła

vector map does not need to be in the current mapset if the print flag is used (https://trac.osgeo.org/grass/changeset/58265 broke it for vect maps in the search path given without an explicit @mapset part); only report DB select count when DB is used

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58285 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 11 lat temu
rodzic
commit
68b4beb609
1 zmienionych plików z 7 dodań i 5 usunięć
  1. 7 5
      vector/v.what.rast/main.c

+ 7 - 5
vector/v.what.rast/main.c

@@ -120,7 +120,10 @@ int main(int argc, char *argv[])
 
     /* 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 @@ int main(int argc, char *argv[])
     }
 
     /* 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);