[GRASS-SVN] r34822 - in grass/trunk: general/g.mlist raster/r.patch raster/r.series scripts/v.dissolve

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-12-10 18:39:46 -0500 (Wed, 10 Dec 2008)
New Revision: 34822

Modified:
   grass/trunk/general/g.mlist/g.mlist.html
   grass/trunk/general/g.mlist/main.c
   grass/trunk/raster/r.patch/r.patch.html
   grass/trunk/raster/r.series/r.series.html
   grass/trunk/scripts/v.dissolve/v.dissolve.html
Log:
revert r34818, separator= is preferred

Modified: grass/trunk/general/g.mlist/g.mlist.html
===================================================================
--- grass/trunk/general/g.mlist/g.mlist.html	2008-12-10 15:13:06 UTC (rev 34821)
+++ grass/trunk/general/g.mlist/g.mlist.html	2008-12-10 23:39:46 UTC (rev 34822)
@@ -66,7 +66,7 @@
 
 Print out "tmp0" ..."tmp9" if corresponding vector map exists (each map name comma separated):
 <div class="code"><pre>
-  g.mlist -r type=vect fs=, pattern='^tmp[0-9]$'
+  g.mlist -r type=vect separator=, pattern='^tmp[0-9]$'
 </pre></div>
 
 This may be useful for other programs' parameter input 

Modified: grass/trunk/general/g.mlist/main.c
===================================================================
--- grass/trunk/general/g.mlist/main.c	2008-12-10 15:13:06 UTC (rev 34821)
+++ grass/trunk/general/g.mlist/main.c	2008-12-10 23:39:46 UTC (rev 34822)
@@ -103,10 +103,14 @@
     opt.exclude->multiple = NO;
     opt.exclude->description = _("Map name exclusion pattern (default: none)");
 
-    opt.separator = G_define_standard_option(G_OPT_F_SEP);
+    opt.separator = G_define_option();
+    opt.separator->key = "separator";
+    opt.separator->type = TYPE_STRING;
+    opt.separator->required = NO;
+    opt.separator->multiple = NO;
     opt.separator->answer = "newline";
     opt.separator->description =
-	_("One-character output field separator, newline, comma, space, or tab");
+	_("One-character output separator, newline, comma, space, or tab");
 
     opt.mapset = G_define_option();
     opt.mapset->key = "mapset";

Modified: grass/trunk/raster/r.patch/r.patch.html
===================================================================
--- grass/trunk/raster/r.patch/r.patch.html	2008-12-10 15:13:06 UTC (rev 34821)
+++ grass/trunk/raster/r.patch/r.patch.html	2008-12-10 23:39:46 UTC (rev 34822)
@@ -89,7 +89,7 @@
 used in the order listed.
 
 <div class="code"><pre>
-MAPS=`g.mlist type=rast fs=, pat="map_*"`
+MAPS=`g.mlist type=rast sep=, pat="map_*"`
 g.region rast=$MAPS
 r.patch in=$MAPS out=mosaic
 </pre></div>

Modified: grass/trunk/raster/r.series/r.series.html
===================================================================
--- grass/trunk/raster/r.series/r.series.html	2008-12-10 15:13:06 UTC (rev 34821)
+++ grass/trunk/raster/r.series/r.series.html	2008-12-10 23:39:46 UTC (rev 34822)
@@ -55,7 +55,7 @@
 Using <em>r.series</em> with wildcards:
 <br>
 <div class="code"><pre>
-r.series input="`g.mlist pattern='insitu_data.*' fs=,`"
+r.series input="`g.mlist pattern='insitu_data.*' sep=,`"
     output=insitu_data.stddev method=stddev
 </pre></div>
 <p>

Modified: grass/trunk/scripts/v.dissolve/v.dissolve.html
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.html	2008-12-10 15:13:06 UTC (rev 34821)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.html	2008-12-10 23:39:46 UTC (rev 34822)
@@ -52,7 +52,7 @@
 
 <div class="code"><pre>
 # patch tiles after import:
-v.patch -e `g.mlist type=vect pat="clc2000_*" fs=,` out=clc2000_patched
+v.patch -e `g.mlist type=vect pat="clc2000_*" sep=,` out=clc2000_patched
 
 # remove duplicated tile boundaries:
 v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01