[GRASS-SVN] r51206 - grass/trunk/raster/r.in.arc

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-03-30 10:24:58 -0700 (Fri, 30 Mar 2012)
New Revision: 51206

Modified:
   grass/trunk/raster/r.in.arc/main.c
Log:
r.in.arc: use standard options (input)


Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c	2012-03-30 17:18:11 UTC (rev 51205)
+++ grass/trunk/raster/r.in.arc/main.c	2012-03-30 17:24:58 UTC (rev 51206)
@@ -62,14 +62,10 @@
     module->description =
 	_("Converts an ESRI ARC/INFO ascii raster file (GRID) into a GRASS raster map.");
     
-    parm.input = G_define_option();
-    parm.input->key = "input";
-    parm.input->type = TYPE_STRING;
-    parm.input->required = YES;
+    parm.input = G_define_standard_option(G_OPT_F_INPUT);
     parm.input->description =
-	_("ARC/INFO ASCII raster file (GRID) to be imported");
-    parm.input->gisprompt = "old_file,file,input";
-
+	_("Name of ARC/INFO ASCII raster file (GRID) to be imported");
+    
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
 
     parm.type = G_define_option();
@@ -98,7 +94,8 @@
 	exit(EXIT_FAILURE);
     input = parm.input->answer;
     output = parm.output->answer;
-    if (title = parm.title->answer)
+    title = parm.title->answer;
+    if (title)
 	G_strip(title);
 
     sscanf(parm.mult->answer, "%lf", &mult_fact);