Pārlūkot izejas kodu

v.edit: require <input> for `tool=add`

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48434 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 gadi atpakaļ
vecāks
revīzija
8a66e2f999
2 mainītis faili ar 13 papildinājumiem un 11 dzēšanām
  1. 2 2
      vector/v.edit/args.c
  2. 11 9
      vector/v.edit/main.c

+ 2 - 2
vector/v.edit/args.c

@@ -77,9 +77,9 @@ int parser(int argc, char *argv[], struct GParams *params,
 
     params->in = G_define_standard_option(G_OPT_F_INPUT);
     params->in->required = NO;
-    params->in->label = _("ASCII file to be converted to binary vector map");
+    params->in->label = _("Name of file containing data in GRASS ASCII vector format");
     params->in->description =
-	_("If not given (or \"-\") reads from standard input");
+	_("\"-\" reads from standard input");
     params->in->guisection = _("Input");
 
     params->move = G_define_option();

+ 11 - 9
vector/v.edit/main.c

@@ -68,17 +68,19 @@ int main(int argc, char *argv[])
     }
 
     /* open input file */
-    if (params.in->answer &&
-	strcmp(params.in->answer, "-") != 0) {
-	ascii = fopen(params.in->answer, "r");
-	if (ascii == NULL) {
-	    G_fatal_error(_("Unable to open file <%s>"),
-			  params.in->answer);
+    if (params.in->answer) {
+	if (strcmp(params.in->answer, "-") != 0) {
+	    ascii = fopen(params.in->answer, "r");
+	    if (ascii == NULL)
+		G_fatal_error(_("Unable to open file <%s>"),
+			      params.in->answer);
+	}
+	else {
+	    ascii = stdin;
 	}
     }
-    else if (action_mode != MODE_CREATE) {
-	ascii = stdin;
-    }
+    if (!ascii && action_mode == MODE_ADD)
+	G_fatal_error(_("Required parameter <%s> not set"), params.in->key);
     
     if (action_mode == MODE_CREATE) {
 	int overwrite;