[GRASS-SVN] r62015 - in grass/trunk: gui/wxpython/animation gui/wxpython/core gui/wxpython/gmodeler gui/wxpython/gui_core gui/wxpython/iclass gui/wxpython/iscatt gui/wxpython/lmgr gui/wxpython/rlisetup gui/wxpython/vnet gui/wxpython/xml lib/gpde/test lib/manage lib/python/gunittest lib/python/gunittest/testsuite lib/python/pygrass lib/python/pygrass/modules lib/python/pygrass/modules/grid lib/python/pygrass/vector/testsuite lib/python/script lib/python/temporal lib/python/temporal/testsuite raster/r.category raster/r.li/r.li.setup raster/r.mapcalc/testsuite raster/r.out.mpeg raster/r.patch raster/r.reclass raster/r.series raster/r.series.accumulate raster/r.series.accumulate/test_suite raster/r.slope.aspect/testsuite raster/r.to.rast3elev raster/r.viewshed/testsuite raster/r.watershed/front raster/simwe/r.sim.water raster3d/r3.cross.rast raster3d/r3.flow/testsuite raster3d/r3.gradient/testsuite raster3d/r3.in.bin/test_suite raster3d/r3.out.netcdf/test_suite raster3d/r3.retile ra ster3d/r3.to.rast scripts/d.rast.edit scripts/d.shadedmap scripts/db.in.ogr scripts/i.in.spotvgt scripts/i.pansharpen scripts/i.spectral scripts/r.buffer.lowmem scripts/r.colors.stddev scripts/r.fillnulls scripts/r.grow scripts/r.in.wms scripts/r.mask scripts/r.reclass.area scripts/r.unpack/test_suite scripts/r3.in.xyz scripts/v.dissolve scripts/v.out.gps scripts/v.rast.stats scripts/v.to.lines scripts/v.unpack scripts/v.unpack/test_suite temporal/t.list temporal/t.merge/testsuite temporal/t.rast.accdetect temporal/t.rast.accumulate temporal/t.rast.gapfill temporal/t.rast.import temporal/t.rast.list temporal/t.rast.mapcalc temporal/t.rast.neighbors temporal/t.rast.out.vtk temporal/t.rast.series temporal/t.rast.to.rast3 temporal/t.rast.to.rast3/testsuite temporal/t.rast3d.list temporal/t.register temporal/t.remove temporal/t.rename temporal/t.support temporal/t.vect.db.select temporal/t.vect.extract temporal/t.vect.import/testsuite temporal/t.vect.list temporal/t.vect.list/te stsuite temporal/t.vect.observe.strds/testsuite temporal/t.vect.univar/testsuite temporal/t.vect.what.strds testsuite/raster tools vector/v.distance vector/v.lrs/v.lrs.create
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Sep 17 09:24:35 PDT 2014
Author: hcho
Date: 2014-09-17 09:24:34 -0700 (Wed, 17 Sep 2014)
New Revision: 62015
Modified:
grass/trunk/gui/wxpython/animation/g.gui.animation.html
grass/trunk/gui/wxpython/core/globalvar.py
grass/trunk/gui/wxpython/gmodeler/frame.py
grass/trunk/gui/wxpython/gmodeler/model.py
grass/trunk/gui/wxpython/gui_core/dialogs.py
grass/trunk/gui/wxpython/gui_core/gselect.py
grass/trunk/gui/wxpython/iclass/frame.py
grass/trunk/gui/wxpython/iscatt/iscatt_core.py
grass/trunk/gui/wxpython/lmgr/datacatalog.py
grass/trunk/gui/wxpython/rlisetup/functions.py
grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
grass/trunk/gui/wxpython/vnet/vnet_core.py
grass/trunk/gui/wxpython/vnet/vnet_data.py
grass/trunk/gui/wxpython/xml/toolboxes.xml
grass/trunk/lib/gpde/test/test_arrays.c
grass/trunk/lib/manage/managelib.dox
grass/trunk/lib/python/gunittest/case.py
grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py
grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py
grass/trunk/lib/python/pygrass/functions.py
grass/trunk/lib/python/pygrass/modules/grid/grid.py
grass/trunk/lib/python/pygrass/modules/shortcuts.py
grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py
grass/trunk/lib/python/script/core.py
grass/trunk/lib/python/script/db.py
grass/trunk/lib/python/script/pythonlib.dox
grass/trunk/lib/python/script/raster.py
grass/trunk/lib/python/script/raster3d.py
grass/trunk/lib/python/temporal/aggregation.py
grass/trunk/lib/python/temporal/extract.py
grass/trunk/lib/python/temporal/mapcalc.py
grass/trunk/lib/python/temporal/register.py
grass/trunk/lib/python/temporal/space_time_datasets.py
grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
grass/trunk/lib/python/temporal/temporal_raster_algebra.py
grass/trunk/lib/python/temporal/temporal_vector_algebra.py
grass/trunk/lib/python/temporal/testsuite/test_register_function.py
grass/trunk/raster/r.category/test_rcategory_doctest.txt
grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh
grass/trunk/raster/r.li/r.li.setup/r.li.setup
grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py
grass/trunk/raster/r.out.mpeg/main.c
grass/trunk/raster/r.patch/r.patch.html
grass/trunk/raster/r.reclass/r.reclass.html
grass/trunk/raster/r.series.accumulate/r.series.accumulate.html
grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
grass/trunk/raster/r.series/r.series.html
grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh
grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py
grass/trunk/raster/r.watershed/front/r.watershed.html
grass/trunk/raster/simwe/r.sim.water/spearfish.sh
grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py
grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
grass/trunk/raster3d/r3.retile/test.r3.retile.sh
grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
grass/trunk/scripts/d.rast.edit/d.rast.edit.py
grass/trunk/scripts/d.shadedmap/d.shadedmap.py
grass/trunk/scripts/db.in.ogr/db.in.ogr.py
grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
grass/trunk/scripts/i.pansharpen/i.pansharpen.py
grass/trunk/scripts/i.spectral/i.spectral.html
grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py
grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py
grass/trunk/scripts/r.fillnulls/r.fillnulls.py
grass/trunk/scripts/r.grow/r.grow.py
grass/trunk/scripts/r.in.wms/wms_base.py
grass/trunk/scripts/r.mask/r.mask.py
grass/trunk/scripts/r.reclass.area/r.reclass.area.py
grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
grass/trunk/scripts/v.dissolve/v.dissolve.html
grass/trunk/scripts/v.dissolve/v.dissolve.py
grass/trunk/scripts/v.out.gps/v.out.gps.py
grass/trunk/scripts/v.rast.stats/v.rast.stats.py
grass/trunk/scripts/v.to.lines/v.to.lines.py
grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
grass/trunk/scripts/v.unpack/v.unpack.py
grass/trunk/temporal/t.list/t.list.html
grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
grass/trunk/temporal/t.rast.list/t.rast.list.html
grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py
grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
grass/trunk/temporal/t.rast3d.list/t.rast3d.list.html
grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
grass/trunk/temporal/t.register/test.t.register.vector.sh
grass/trunk/temporal/t.remove/t.remove.html
grass/trunk/temporal/t.remove/t.remove.py
grass/trunk/temporal/t.rename/test.t.rename.sh
grass/trunk/temporal/t.support/test.t.support.sh
grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh
grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh
grass/trunk/temporal/t.vect.list/t.vect.list.html
grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
grass/trunk/testsuite/raster/raster_md5test.sh
grass/trunk/testsuite/raster/rhemisphere.sh
grass/trunk/tools/thumbnails.py
grass/trunk/vector/v.distance/v.distance.html
grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
Log:
Rename g.mlist to g.list and update g.remove usage
Modified: grass/trunk/gui/wxpython/animation/g.gui.animation.html
===================================================================
--- grass/trunk/gui/wxpython/animation/g.gui.animation.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/animation/g.gui.animation.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -63,15 +63,15 @@
</pre></div>
The loading of a series of maps into the Animation Tool can be simplified
-with <em><a href="g.mlist.html">g.mlist<a></em> (back ticks syntax works for Linux and Mac only):
+with <em><a href="g.list.html">g.list<a></em> (back ticks syntax works for Linux and Mac only):
<div class="code"><pre>
-g.gui.animation rast=`g.mlist type=rast mapset=. separator=comma pattern="precip*"`
+g.gui.animation rast=`g.list type=rast mapset=. separator=comma pattern="precip*"`
</pre></div>
Using extended regular expressions, the list of a series of raster maps can be subset by
e.g., numeric range (here: precipitation for the years 1997-2012):
<div class="code"><pre>
-g.gui.animation rast=`g.mlist -e type=rast mapset=. separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"`
+g.gui.animation rast=`g.list -e type=rast mapset=. separator=comma pattern="precip_total.(199[7-9]|200[0-9]|201[0-2]).sum"`
</pre></div>
@@ -85,7 +85,7 @@
<p>
<em>
<a href="g.gui.timeline.html">g.gui.timeline</a>,
- <a href="g.mlist.html">g.mlist</a>
+ <a href="g.list.html">g.list</a>
</em>
<p>
Modified: grass/trunk/gui/wxpython/core/globalvar.py
===================================================================
--- grass/trunk/gui/wxpython/core/globalvar.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/core/globalvar.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -201,11 +201,11 @@
"""@Toolbar icon size"""
toolbarSize = (24, 24)
-"""@Is g.mlist available?"""
-if 'g.mlist' in grassCmd:
- have_mlist = True
+"""@Is g.list available?"""
+if 'g.list' in grassCmd:
+ have_list = True
else:
- have_mlist = False
+ have_list = False
"""@Check version of wxPython, use agwStyle for 2.8.11+"""
hasAgw = CheckWxVersion()
Modified: grass/trunk/gui/wxpython/gmodeler/frame.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/frame.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/gmodeler/frame.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -326,11 +326,14 @@
dlg.Destroy()
if rast:
- self._gconsole.RunCmd(['g.remove', 'rast=%s' %','.join(rast)])
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=rast',
+ 'pattern=%s' %','.join(rast)])
if rast3d:
- self._gconsole.RunCmd(['g.remove', 'rast3d=%s' %','.join(rast3d)])
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=rast3d',
+ 'pattern=%s' %','.join(rast3d)])
if vect:
- self._gconsole.RunCmd(['g.remove', 'vect=%s' %','.join(vect)])
+ self._gconsole.RunCmd(['g.remove', '-f', 'type=vect',
+ 'pattern=%s' %','.join(vect)])
self.SetStatusText(_("%d maps deleted from current mapset") % \
int(len(rast) + len(rast3d) + len(vect)))
Modified: grass/trunk/gui/wxpython/gmodeler/model.py
===================================================================
--- grass/trunk/gui/wxpython/gmodeler/model.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/gmodeler/model.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -709,11 +709,11 @@
rast, vect, rast3d, msg = self.GetIntermediateData()
if rast:
- log.RunCmd(['g.remove', 'rast=%s' %','.join(rast)])
+ log.RunCmd(['g.remove', '-f', 'type=rast', 'pattern=%s' %','.join(rast)])
if rast3d:
- log.RunCmd(['g.remove', 'rast3d=%s' %','.join(rast3d)])
+ log.RunCmd(['g.remove', '-f', 'type=rast3d', 'pattern=%s' %','.join(rast3d)])
if vect:
- log.RunCmd(['g.remove', 'vect=%s' %','.join(vect)])
+ log.RunCmd(['g.remove', '-f', 'type=vect', 'pattern=%s' %','.join(vect)])
def GetIntermediateData(self):
"""Get info about intermediate data"""
@@ -2338,18 +2338,18 @@
""")
if rast:
self.fd.write(
-r""" run_command('g.remove',
- rast=%s)
+r""" run_command('g.remove', flags='f', type='rast',
+ pattern=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast)))
if vect:
self.fd.write(
-r""" run_command('g.remove',
- vect = %s)
+r""" run_command('g.remove', flags='f', type='vect',
+ pattern=%s)
"""% ','.join(map(lambda x: "'" + x + "'", vect)))
if rast3d:
self.fd.write(
-r""" run_command('g.remove',
- rast3d = %s)
+r""" run_command('g.remove', flags='f', type='rast3d',
+ pattern=%s)
"""% ','.join(map(lambda x: "'" + x + "'", rast3d)))
if not rast and not vect and not rast3d:
self.fd.write(' pass\n')
Modified: grass/trunk/gui/wxpython/gui_core/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/dialogs.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/gui_core/dialogs.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -1513,7 +1513,7 @@
def GetLayerType(self, cmd = False):
"""Get selected layer type
- :param bool cmd: True for g.mlist
+ :param bool cmd: True for g.list
"""
if not cmd:
return self.layerType.GetStringSelection()
@@ -1575,7 +1575,7 @@
def _modelerDSeries(self):
self.dseries = wx.CheckBox(parent = self, id = wx.ID_ANY,
- label = _("Dynamic series (%s)") % 'g.mlist')
+ label = _("Dynamic series (%s)") % 'g.list')
self.dseries.SetValue(False)
self.mainSizer.Add(item = self.dseries, proportion = 0,
flag = wx.EXPAND | wx.LEFT | wx.RIGHT, border = 5)
@@ -1583,12 +1583,12 @@
def GetDSeries(self):
"""Used by modeler only
- :return: g.mlist command
+ :return: g.list command
"""
if not self.dseries or not self.dseries.IsChecked():
return ''
- cond = 'map in `g.mlist type=%s ' % self.GetLayerType(cmd = True)
+ cond = 'map in `g.list type=%s ' % self.GetLayerType(cmd = True)
patt = self.filter.GetValue()
if patt:
cond += 'pattern=%s ' % patt
Modified: grass/trunk/gui/wxpython/gui_core/gselect.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/gselect.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/gui_core/gselect.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -407,7 +407,7 @@
# get current mapset
curr_mapset = grass.gisenv()['MAPSET']
- # map element types to g.mlist types
+ # map element types to g.list types
elementdict = {'cell':'rast',
'raster':'rast',
'rast':'rast',
Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/iclass/frame.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -254,7 +254,9 @@
"""Removes temporary vector map with training areas"""
ret = RunCommand(prog = 'g.remove',
parent = self,
- vect = self.trainingAreaVector)
+ flags = 'f',
+ type = 'vect',
+ pattern = self.trainingAreaVector)
if ret != 0:
return False
return True
@@ -265,7 +267,9 @@
self.GetSecondMap().Clean()
ret = RunCommand(prog = 'g.remove',
parent = self,
- rast = raster)
+ flags = 'f',
+ type = 'rast',
+ pattern = raster)
if ret != 0:
return False
return True
Modified: grass/trunk/gui/wxpython/iscatt/iscatt_core.py
===================================================================
--- grass/trunk/gui/wxpython/iscatt/iscatt_core.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/iscatt/iscatt_core.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -284,8 +284,7 @@
ret = UpdateCatRast(patch_rast, region, self.scatts_dt.GetCatRastCond(cat))
if ret < 0:
GException(_("Patching category raster conditions file failed."))
- RunCommand("g.remove",
- rast = patch_rast)
+ RunCommand("g.remove", flags='f', type='rast', pattern=patch_rast)
def _rasterize(self, grass_region, layer, cat, out_rast):
@@ -598,8 +597,8 @@
grass.try_remove(self.cats_rasts_conds[cat_id])
del self.cats_rasts_conds[cat_id]
- RunCommand("g.remove",
- rast=self.cats_rasts[cat_id])
+ RunCommand("g.remove", flags='f', type='rast',
+ pattern=self.cats_rasts[cat_id])
del self.cats_rasts[cat_id]
return True
@@ -709,8 +708,8 @@
for tmp in self.cats_rasts_conds.itervalues():
grass.try_remove(tmp)
for tmp in self.cats_rasts.itervalues():
- RunCommand("g.remove",
- rast=tmp,
+ RunCommand("g.remove", flags='f',
+ type='rast', pattern=tmp,
getErrorMsg=True)
self.cats_rasts = {}
Modified: grass/trunk/gui/wxpython/lmgr/datacatalog.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/datacatalog.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/lmgr/datacatalog.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -116,7 +116,7 @@
self.ChangeEnvironment(location)
varloc = self.AppendItem(self.root, loc)
#get list of all maps in location
- maplist = RunCommand('g.mlist', flags='mt', type='rast,rast3d,vect', mapset=','.join(mapsets),
+ maplist = RunCommand('g.list', flags='mt', type='rast,rast3d,vect', mapset=','.join(mapsets),
quiet=True, read=True)
maplist = maplist.splitlines()
for ml in maplist:
@@ -414,15 +414,18 @@
label = _("Deleting") + " " + string + " ..."
self.showNotification.emit(message=label)
if (self.GetItemText(self.selected_type)=='vect'):
- removed = RunCommand('g.remove', vect=string)
+ removed = RunCommand('g.remove', flags='f', type='vect',
+ pattern=string)
elif (self.GetItemText(self.selected_type)=='rast'):
- removed = RunCommand('g.remove', rast=string)
+ removed = RunCommand('g.remove', flags='f', type='rast',
+ pattern=string)
else:
- removed = RunCommand('g.remove', rast3d=string)
+ removed = RunCommand('g.remove', flags='f', type='rast3d',
+ pattern=string)
if (removed==0):
self.Delete(self.selected_layer)
Debug.msg(1,"LAYER "+string+" DELETED")
- label = "g.remove "+self.GetItemText(self.selected_type)+"="+string+" -- completed" # generate this message (command) automatically?
+ label = "g.remove -f type="+self.GetItemText(self.selected_type)+" pattern="+string+" -- completed" # generate this message (command) automatically?
self.showNotification.emit(message=label)
self.RestoreBackup()
Modified: grass/trunk/gui/wxpython/rlisetup/functions.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/functions.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/rlisetup/functions.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -85,7 +85,8 @@
grass.run_command('g.region', vect=tmp_vect, align=origrast)
grass.run_command('v.to.rast', input=vect, output=outrast, use='cat',
cats=cat, overwrite=True, quiet=True)
- grass.run_command('g.remove', vect=tmp_vect, quiet=True)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=tmp_vect, quiet=True)
def obtainAreaVector(outrast):
Modified: grass/trunk/gui/wxpython/rlisetup/sampling_frame.py
===================================================================
--- grass/trunk/gui/wxpython/rlisetup/sampling_frame.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/rlisetup/sampling_frame.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -263,8 +263,8 @@
marea = MaskedArea(region, rasterName)
- RunCommand('g.remove', rast=tmpraster)
- RunCommand('g.remove', vect=tmpvector)
+ RunCommand('g.remove', flags='f', type='rast', pattern=tmpraster)
+ RunCommand('g.remove', flags='f', type='vect', pattern=tmpvector)
os.unlink(polyfile.name)
return marea
Modified: grass/trunk/gui/wxpython/vnet/vnet_core.py
===================================================================
--- grass/trunk/gui/wxpython/vnet/vnet_core.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/vnet/vnet_core.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -121,8 +121,8 @@
# for case there is some map with same name
# (when analysis does not produce any map, this map would have been shown as result)
- RunCommand('g.remove',
- vect = self.results["vect_map"].GetVectMapName())
+ RunCommand('g.remove', flags = 'f', type = 'vect',
+ pattern = self.results["vect_map"].GetVectMapName())
# save data from
self.history._saveAnInputToHist(analysis, params, flags)
Modified: grass/trunk/gui/wxpython/vnet/vnet_data.py
===================================================================
--- grass/trunk/gui/wxpython/vnet/vnet_data.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/vnet/vnet_data.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -938,8 +938,8 @@
"""
if vectMap:
vectMap.DeleteRenderLayer()
- RunCommand('g.remove',
- vect = vectMap.GetVectMapName())
+ RunCommand('g.remove', flags = 'f', type = 'vect',
+ pattern = vectMap.GetVectMapName())
self.RemoveFromTmpMaps(vectMap)
return True
return False
@@ -948,8 +948,8 @@
"""Delete all temporary maps in the class"""
update = False
for tmpMap in self.tmpMaps:
- RunCommand('g.remove',
- vect = tmpMap.GetVectMapName())
+ RunCommand('g.remove', flags = 'f', type = 'vect',
+ pattern = tmpMap.GetVectMapName())
if tmpMap.DeleteRenderLayer():
update = True
return update
Modified: grass/trunk/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/trunk/gui/wxpython/xml/toolboxes.xml 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/gui/wxpython/xml/toolboxes.xml 2014-09-17 16:24:34 UTC (rev 62015)
@@ -518,9 +518,6 @@
<module-item name="g.list">
<label>List</label>
</module-item>
- <module-item name="g.mlist">
- <label>List filtered</label>
- </module-item>
<separator/>
<module-item name="g.rename">
<label>Rename</label>
@@ -529,9 +526,6 @@
<module-item name="g.remove">
<label>Delete</label>
</module-item>
- <module-item name="g.mremove">
- <label>Delete filtered</label>
- </module-item>
</items>
</toolbox>
<toolbox name="MapTypeConversions">
Modified: grass/trunk/lib/gpde/test/test_arrays.c
===================================================================
--- grass/trunk/lib/gpde/test/test_arrays.c 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/gpde/test/test_arrays.c 2014-09-17 16:24:34 UTC (rev 62015)
@@ -294,7 +294,7 @@
sprintf(buff,
- "g.remove rast=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+ "g.remove -f type=rast pattern=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
system(buff);
N_free_array_2d(data1);
@@ -588,7 +588,7 @@
sprintf(buff,
- "g.remove rast=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
+ "g.remove -f type=rast pattern=gpde_lib_test_raster_1,gpde_lib_test_raster_2,gpde_lib_test_raster_3");
system(buff);
@@ -857,7 +857,7 @@
N_free_array_3d(tmp);
sprintf(buff,
- "g.remove rast3d=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
+ "g.remove -f type=rast3d pattern=gpde_lib_test_volume_1,gpde_lib_test_volume_2");
system(buff);
N_free_array_3d(data1);
Modified: grass/trunk/lib/manage/managelib.dox
===================================================================
--- grass/trunk/lib/manage/managelib.dox 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/manage/managelib.dox 2014-09-17 16:24:34 UTC (rev 62015)
@@ -5,8 +5,7 @@
\section manageintro Introduction
This library used for management of data base elements. See modules
-<tt>g.list, g.mlist, g.remove, g.mremove, g.copy</tt> or
-<tt>g.rename</tt>.
+<tt>g.list, g.remove, g.copy</tt> or <tt>g.rename</tt>.
\code
#include <grass/manage.h>
Modified: grass/trunk/lib/python/gunittest/case.py
===================================================================
--- grass/trunk/lib/python/gunittest/case.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/gunittest/case.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -125,7 +125,7 @@
"does not corresond to currently set"
" WIND_OVERRIDE ({c})",
n=cls._temp_region, c=name)
- call_module("g.remove", quiet=True, region=name)
+ call_module("g.remove", quiet=True, flags='f', type='region', pattern=name)
# TODO: we don't know if user calls this
# so perhaps some decorator which would use with statemet
# but we have zero chance of infuencing another test class
@@ -628,7 +628,7 @@
sep='=', precision=precision,
reference=statistics, msg=msg)
finally:
- call_module('g.remove', rast=diff)
+ call_module('g.remove', flags='f', type='rast', pattern=diff)
else:
# general case
# TODO: we are using r.info min max and r.univar min max interchangably
@@ -654,7 +654,7 @@
self.assertRasterFitsUnivar(raster=diff, reference=statistics,
precision=precision, msg=msg)
finally:
- call_module('g.remove', rast=diff)
+ call_module('g.remove', flags='f', type='rast', pattern=diff)
def assertRasters3dNoDifference(self, actual, reference,
precision, statistics=None, msg=None):
@@ -675,7 +675,7 @@
sep='=', precision=precision,
reference=statistics, msg=msg)
finally:
- call_module('g.remove', rast3d=diff)
+ call_module('g.remove', flags='f', type='rast3d', pattern=diff)
else:
# general case
# TODO: we are using r.info min max and r.univar min max interchangably
@@ -701,7 +701,7 @@
self.assertRaster3dFitsUnivar(raster=diff, reference=statistics,
precision=precision, msg=msg)
finally:
- call_module('g.remove', rast3d=diff)
+ call_module('g.remove', flags='f', type='rast3d', pattern=diff)
# TODO: this works only in 2D
# TODO: write tests
@@ -744,7 +744,7 @@
reference=ref_info,
msg=msg, precision=precision)
finally:
- call_module('g.remove', vect=remove)
+ call_module('g.remove', flags='f', type='vect', pattern=remove)
# TODO: write tests
def assertVectorsNoAreaDifference(self, actual, reference, precision,
@@ -777,7 +777,7 @@
va=actual, vr=reference, p=precision, a=total_area)
self.fail(self._formatMessage(msg, stdmsg))
finally:
- call_module('g.remove', vect=diff)
+ call_module('g.remove', flags='f', type='vect', pattern=diff)
# TODO: here we have to have significant digits which is not consistent
# TODO: documentation for all new asserts
@@ -841,7 +841,7 @@
# we rely on fail method to either raise or return (soon)
os.remove(factual)
if vreference:
- self.runModule('g.remove', vect=vreference)
+ self.runModule('g.remove', flags='f', type='vect', pattern=vreference)
# TODO: we expect v.out.ascii to give the same order all the time, is that OK?
def assertVectorAsciiEqualsVectorAscii(self, actual, reference,
Modified: grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py
===================================================================
--- grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/gunittest/testsuite/test_assertions_rast3d.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -29,8 +29,8 @@
def tearDownClass(cls):
cls.del_temp_region()
# TODO: input as list does not work, why?
- cls.runModule('g.remove',
- rast3d=','.join([cls.constant_map, cls.rcd_increasing_map]))
+ cls.runModule('g.remove', flags='f', type='rast3d',
+ pattern=','.join([cls.constant_map, cls.rcd_increasing_map]))
def test_assertRaster3dFitsUnivar(self):
reference = dict(n=1000000,
Modified: grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py
===================================================================
--- grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/gunittest/testsuite/test_assertions_vect.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -138,7 +138,8 @@
# when invoking separately, no need to delete maps since mapset
# is deleted
if cls.maps_to_remove:
- cls.runModule('g.remove', vect=','.join(cls.maps_to_remove))
+ cls.runModule('g.remove', flags='f', type='vect',
+ pattern=','.join(cls.maps_to_remove))
def test_assertVectorEqualsVector_basic(self):
"""Check completely different maps."""
Modified: grass/trunk/lib/python/pygrass/functions.py
===================================================================
--- grass/trunk/lib/python/pygrass/functions.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/pygrass/functions.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -94,10 +94,10 @@
return find_in_gisdbase(type, pattern, gis)
-def remove(oldname, maptype, **kwargs):
+def remove(oldname, maptype):
"""Remove a map"""
- kwargs.update({maptype: '{old}'.format(old=oldname)})
- grasscore.run_command('g.remove', quiet=True, **kwargs)
+ grasscore.run_command('g.remove', quiet=True, flags='f',
+ type=maptype, pattern=oldname)
def rename(oldname, newname, maptype, **kwargs):
Modified: grass/trunk/lib/python/pygrass/modules/grid/grid.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/grid/grid.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/pygrass/modules/grid/grid.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -255,7 +255,7 @@
mpclc(expression="%s=%s" % (name, rast), overwrite=True, env_=env)
file_dst = "%s.pack" % os.path.join(path_dst, name)
rpck(input=name, output=file_dst, overwrite=True, env_=env)
- remove(rast=name, env_=env)
+ remove(flags='f', type='rast', pattern=name, env_=env)
# change gisdbase to dst
env['GISRC'] = gisrc_dst
rupck(input=file_dst, output=rast_clean, overwrite=True, env_=env)
@@ -289,7 +289,7 @@
name = nam % vect
file_dst = "%s.pack" % os.path.join(path_dst, name)
vpck(input=name, output=file_dst, overwrite=True, env_=env)
- remove(vect=name, env_=env)
+ remove(flags='f', type='vect', pattern=name, env_=env)
# change gisdbase to dst
env['GISRC'] = gisrc_dst
vupck(input=file_dst, output=vect, overwrite=True, env_=env)
@@ -603,4 +603,4 @@
if self.inlist:
grm = Module('g.remove')
for key in self.inlist:
- grm(rast=self.inlist[key])
+ grm(flags='f', type='rast', pattern=self.inlist[key])
Modified: grass/trunk/lib/python/pygrass/modules/shortcuts.py
===================================================================
--- grass/trunk/lib/python/pygrass/modules/shortcuts.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/pygrass/modules/shortcuts.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -20,16 +20,16 @@
"""Example how to use MetaModule
>>> g = MetaModule('g')
- >>> g_mlist = g.mlist
- >>> g_mlist.name
- 'g.mlist'
- >>> g_mlist.required
+ >>> g_list = g.list
+ >>> g_list.name
+ 'g.list'
+ >>> g_list.required
['type']
- >>> g_mlist.inputs.type = 'rast'
- >>> g_mlist.stdout_ = -1
- >>> g_mlist.run()
- Module('g.mlist')
- >>> g_mlist.outputs.stdout # doctest: +ELLIPSIS
+ >>> g_list.inputs.type = 'rast'
+ >>> g_list.stdout_ = -1
+ >>> g_list.run()
+ Module('g.list')
+ >>> g_list.outputs.stdout # doctest: +ELLIPSIS
'...basins...soils...'
>>> r = MetaModule('r')
>>> what = r.what
Modified: grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py
===================================================================
--- grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/pygrass/vector/testsuite/test_vector3d.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -61,7 +61,7 @@
"""Remove the generated vector map, if exist"""
mset = get_mapset_vector(cls.tmpname, mapset='')
if mset:
- run_command("g.remove", vect="%s@%s" % (cls.tmpname, mset))
+ run_command("g.remove", flags='f', type='vect', pattern=cls.tmpname)
if __name__ == '__main__':
Modified: grass/trunk/lib/python/script/core.py
===================================================================
--- grass/trunk/lib/python/script/core.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/script/core.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -1006,7 +1006,7 @@
"""Unsets WIND_OVERRIDE and removes any region named by it."""
try:
name = os.environ.pop('WIND_OVERRIDE')
- run_command("g.remove", quiet=True, region=name)
+ run_command("g.remove", flags='f', quiet=True, type='region', pattern=name)
except:
pass
@@ -1040,97 +1040,10 @@
# interface to g.list
-def list_grouped(type, check_search_path=True):
- """List elements grouped by mapsets.
-
- Returns the output from running g.list, as a dictionary where the
- keys are mapset names and the values are lists of maps in that
- mapset. Example:
-
- >>> list_grouped('rast')['PERMANENT'] # doctest: +ELLIPSIS
- ['basins' ... 'landuse']
-
-
- :param str type: element type (rast, vect, rast3d, region, ...)
- :param bool check_search_path: True to add mapsets for the search path
- with no found elements
-
- :return: directory of mapsets/elements
- """
- if type == 'raster' or type == 'cell':
- verbose(_('Element type should be "rast" and not "%s"') % type)
- type = 'rast'
- dashes_re = re.compile("^----+$")
- mapset_re = re.compile("<(.*)>")
- result = {}
- if check_search_path:
- for mapset in mapsets(search_path=True):
- result[mapset] = []
-
- mapset = None
- for line in read_command("g.list", type=type).splitlines():
- if line == "":
- continue
- if dashes_re.match(line):
- continue
- m = mapset_re.search(line)
- if m:
- mapset = m.group(1)
- if mapset not in result.keys():
- result[mapset] = []
- continue
- if mapset:
- result[mapset].extend(line.split())
-
- return result
-
-
-def _concat(xs):
- result = []
- for x in xs:
- result.extend(x)
- return result
-
-
-def list_pairs(type):
- """List of elements as tuples.
-
- Returns the output from running g.list, as a list of (map, mapset)
- pairs. Example:
-
- >>> list_pairs('rast') # doctest: +ELLIPSIS
- [('basins', 'PERMANENT'), ... ('landuse', 'PERMANENT')]
-
- :param str type: element type (rast, vect, rast3d, region, ...)
-
- :return: list of tuples (map, mapset)
- """
- return _concat([[(map, mapset) for map in maps]
- for mapset, maps in list_grouped(type).iteritems()])
-
-
-def list_strings(type):
+def list_strings(type, pattern=None, mapset=None, exclude=None, flag=''):
"""List of elements as strings.
Returns the output from running g.list, as a list of qualified
- names. Example:
-
- >>> list_strings('rast') # doctest: +ELLIPSIS
- [..., 'lakes at PERMANENT', ..., 'slope at PERMANENT', ...
-
- :param str type: element type
-
- :return: list of strings ('map@@mapset')
- """
- return ["%s@%s" % pair for pair in list_pairs(type)]
-
-# interface to g.mlist
-
-
-def mlist_strings(type, pattern=None, mapset=None, exclude=None, flag=''):
- """List of elements as strings.
-
- Returns the output from running g.mlist, as a list of qualified
names.
:param str type: element type (rast, vect, rast3d, region, ...)
@@ -1146,7 +1059,7 @@
verbose(_('Element type should be "rast" and not "%s"') % type)
type = 'rast'
result = list()
- for line in read_command("g.mlist",
+ for line in read_command("g.list",
quiet=True,
flags='m' + flag,
type=type,
@@ -1158,10 +1071,10 @@
return result
-def mlist_pairs(type, pattern=None, mapset=None, exclude=None, flag=''):
+def list_pairs(type, pattern=None, mapset=None, exclude=None, flag=''):
"""List of elements as pairs
- Returns the output from running g.mlist, as a list of
+ Returns the output from running g.list, as a list of
(name, mapset) pairs
:param str type: element type (rast, vect, rast3d, region, ...)
@@ -1173,20 +1086,20 @@
:return: list of elements
"""
- return [tuple(map.split('@', 1)) for map in mlist_strings(type, pattern,
+ return [tuple(map.split('@', 1)) for map in list_strings(type, pattern,
mapset, exclude,
flag)]
-def mlist_grouped(type, pattern=None, check_search_path=True, exclude=None,
+def list_grouped(type, pattern=None, check_search_path=True, exclude=None,
flag=''):
"""List of elements grouped by mapsets.
- Returns the output from running g.mlist, as a dictionary where the
+ Returns the output from running g.list, as a dictionary where the
keys are mapset names and the values are lists of maps in that
mapset. Example:
- >>> mlist_grouped('vect', pattern='*roads*')['PERMANENT']
+ >>> list_grouped('vect', pattern='*roads*')['PERMANENT']
['railroads', 'roadsmajor']
:param str type: element type (rast, vect, rast3d, region, ...)
@@ -1208,7 +1121,7 @@
result[mapset] = []
mapset = None
- for line in read_command("g.mlist", quiet=True, flags="m" + flag,
+ for line in read_command("g.list", quiet=True, flags="m" + flag,
type=type, pattern=pattern, exclude=exclude).splitlines():
try:
name, mapset = line.split('@')
Modified: grass/trunk/lib/python/script/db.py
===================================================================
--- grass/trunk/lib/python/script/db.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/script/db.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -31,7 +31,7 @@
0
>>> db_describe('myfirestations') # doctest: +ELLIPSIS
{'nrows': 71, 'cols': [['cat', 'INTEGER', '20'], ... 'ncols': 22}
- >>> run_command('g.remove', vect='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
0
:param str table: table name
@@ -71,7 +71,7 @@
0
>>> db_table_exist('myfirestations')
True
- >>> run_command('g.remove', vect='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
0
:param str table: table name
@@ -118,7 +118,7 @@
>>> db_select(table = 'myfirestations') # doctest: +ELLIPSIS
(('1', '24', 'Morrisville #3', ... 'HS2A', '1.37'))
- >>> run_command('g.remove', vect='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
0
:param str sql: SQL statement to perform (or None)
@@ -164,7 +164,7 @@
>>> db_table_in_vector('myfirestations')
['myfirestations at user1']
>>> db_table_in_vector('mfirestations')
- >>> run_command('g.remove', vect='myfirestations')
+ >>> run_command('g.remove', flags='f', type='vect', pattern='myfirestations')
0
:param str table: name of table to query
Modified: grass/trunk/lib/python/script/pythonlib.dox
===================================================================
--- grass/trunk/lib/python/script/pythonlib.dox 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/script/pythonlib.dox 2014-09-17 16:24:34 UTC (rev 62015)
@@ -157,8 +157,6 @@
- python::script::core::list_strings()
- - python::script::core::mlist_grouped()
-
<b>Interface to \gmod{g.mapsets}</b>
- python::script::core::mapsets()
Modified: grass/trunk/lib/python/script/raster.py
===================================================================
--- grass/trunk/lib/python/script/raster.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/script/raster.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -119,7 +119,7 @@
0
>>> p2.wait()
1
- >>> run_command('g.remove', rast=output)
+ >>> run_command('g.remove', flags='f', type='rast', pattern=output)
:param str exp: expression
:param bool quiet: True to run quietly (<tt>--q</tt>)
Modified: grass/trunk/lib/python/script/raster3d.py
===================================================================
--- grass/trunk/lib/python/script/raster3d.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/script/raster3d.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -32,7 +32,7 @@
>>> mapcalc3d('volume = row() + col() + depth()')
>>> raster3d_info('volume') # doctest: +ELLIPSIS
{'vertical_units': '"units"', 'tbres': 1.0, ... 'south': 185000.0}
- >>> run_command('g.remove', rast3d='volume')
+ >>> run_command('g.remove', flags='f', type='rast3d', pattern='volume')
0
:param str map: map name
Modified: grass/trunk/lib/python/temporal/aggregation.py
===================================================================
--- grass/trunk/lib/python/temporal/aggregation.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/aggregation.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -174,7 +174,7 @@
# In case of a null map continue, do not register null maps
if new_map.metadata.get_min() is None and new_map.metadata.get_max() is None:
if not register_null:
- gscript.run_command("g.remove", rast=output)
+ gscript.run_command("g.remove", flags='f', type='rast', pattern=output)
return None
return new_map
Modified: grass/trunk/lib/python/temporal/extract.py
===================================================================
--- grass/trunk/lib/python/temporal/extract.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/extract.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -237,11 +237,14 @@
names += ",%s" % (map.get_name())
count += 1
if type == "raster":
- gscript.run_command("g.remove", rast=names, quiet=True)
+ gscript.run_command("g.remove", flags='f', type='rast',
+ pattern=names, quiet=True)
elif type == "raster3d":
- gscript.run_command("g.remove", rast3d=names, quiet=True)
+ gscript.run_command("g.remove", flags='f', type='rast3d',
+ pattern=names, quiet=True)
elif type == "vector":
- gscript.run_command("g.remove", vect=names, quiet=True)
+ gscript.run_command("g.remove", flags='f', type='vect',
+ pattern=names, quiet=True)
dbif.close()
Modified: grass/trunk/lib/python/temporal/mapcalc.py
===================================================================
--- grass/trunk/lib/python/temporal/mapcalc.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/mapcalc.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -331,9 +331,11 @@
names += ",%s" % (map.get_name())
count += 1
if type == "raster":
- gscript.run_command("g.remove", rast=names, quiet=True)
+ gscript.run_command("g.remove", flags='f', type='rast',
+ pattern=names, quiet=True)
elif type == "raster3d":
- gscript.run_command("g.remove", rast3d=names, quiet=True)
+ gscript.run_command("g.remove", flags='f', type='rast3d',
+ pattern=names, quiet=True)
dbif.close()
Modified: grass/trunk/lib/python/temporal/register.py
===================================================================
--- grass/trunk/lib/python/temporal/register.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/register.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -481,7 +481,7 @@
register_maps_in_space_time_dataset(type, output_stds_id, unit=unit,
file=filename, dbif=dbif)
- g_remove = pymod.Module("g.remove", quiet=True,
+ g_remove = pymod.Module("g.remove", flags='f', quiet=True,
run_=False, finish_=True)
# Remove empty maps
@@ -490,7 +490,7 @@
if map.is_in_db(dbif):
map.delete(dbif)
mod = copy.deepcopy(g_remove)
- mod(rast=map.get_name())
+ mod(type='rast', pattern=map.get_name())
mod.run()
if connected:
Modified: grass/trunk/lib/python/temporal/space_time_datasets.py
===================================================================
--- grass/trunk/lib/python/temporal/space_time_datasets.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/space_time_datasets.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -103,7 +103,7 @@
>>> rmap.is_time_relative()
False
- >>> grass.run_command("g.remove", rast=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="rast", pattern=name, quiet=True)
0
>>> grass.del_temp_region()
@@ -420,7 +420,7 @@
True
>>> r3map.is_time_relative()
False
- >>> grass.run_command("g.remove", rast3d=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="rast3d", pattern=name, quiet=True)
0
>>> grass.del_temp_region()
"""
@@ -741,7 +741,7 @@
True
>>> vmap.is_time_relative()
False
- >>> grass.run_command("g.remove", vect=name, quiet=True)
+ >>> grass.run_command("g.remove", flags="f", type="vect", pattern=name, quiet=True)
0
>>> grass.del_temp_region()
Modified: grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/temporal_raster3d_algebra.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -23,7 +23,7 @@
TemporalRasterBaseAlgebraParser.__init__(self, pid, run, debug, spatial, nprocs, register_null)
self.m_mapcalc = pymod.Module('r3.mapcalc')
- self.m_mremove = pymod.Module('g.mremove')
+ self.m_remove = pymod.Module('g.remove')
def parse(self, expression, basename = None, overwrite=False):
self.lexer = TemporalRasterAlgebraLexer()
@@ -49,7 +49,7 @@
stringlist = ",".join(chunk)
if self.run:
- m = copy.deepcopy(self.m_mremove)
+ m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "rast3d"
m.inputs["pattern"].value = stringlist
m.flags["f"].value = True
Modified: grass/trunk/lib/python/temporal/temporal_raster_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_raster_algebra.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/temporal_raster_algebra.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -64,7 +64,7 @@
TemporalRasterBaseAlgebraParser.__init__(self, pid, run, debug, spatial, nprocs, register_null)
self.m_mapcalc = pymod.Module('r.mapcalc', run_=False, finish_=False)
- self.m_mremove = pymod.Module('g.mremove')
+ self.m_remove = pymod.Module('g.remove')
def parse(self, expression, basename = None, overwrite=False):
self.lexer = TemporalRasterAlgebraLexer()
@@ -90,7 +90,7 @@
stringlist = ",".join(chunk)
if self.run:
- m = copy.deepcopy(self.m_mremove)
+ m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "rast"
m.inputs["pattern"].value = stringlist
m.flags["f"].value = True
Modified: grass/trunk/lib/python/temporal/temporal_vector_algebra.py
===================================================================
--- grass/trunk/lib/python/temporal/temporal_vector_algebra.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/temporal_vector_algebra.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -493,7 +493,7 @@
self.m_overlay = pygrass.Module('v.overlay', quiet=True, run_=False)
self.m_rename = pygrass.Module('g.rename', quiet=True, run_=False)
self.m_patch = pygrass.Module('v.patch', quiet=True, run_=False)
- self.m_mremove = pygrass.Module('g.mremove', quiet=True, run_=False)
+ self.m_remove = pygrass.Module('g.remove', quiet=True, run_=False)
self.m_buffer = pygrass.Module('v.buffer', quiet=True, run_=False)
def parse(self, expression, basename = None, overwrite = False):
@@ -520,10 +520,10 @@
for chunk in chunklist:
stringlist = ",".join(chunk)
if self.debug:
- print "g.mremove type=vect pattern=%s"%(stringlist)
+ print "g.remove type=vect pattern=%s"%(stringlist)
if self.run:
- m = copy.deepcopy(self.m_mremove)
+ m = copy.deepcopy(self.m_remove)
m.inputs["type"].value = "vect"
m.inputs["pattern"].value = stringlist
m.flags["f"].value = True
Modified: grass/trunk/lib/python/temporal/testsuite/test_register_function.py
===================================================================
--- grass/trunk/lib/python/temporal/testsuite/test_register_function.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/lib/python/temporal/testsuite/test_register_function.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -52,7 +52,7 @@
"""!Remove maps from temporal database
"""
self.runModule("t.unregister", maps="register_map_1,register_map_2", quiet=True)
- self.runModule("g.mremove", type="rast", pattern="register_map_1,register_map_2", quiet=True)
+ self.runModule("g.remove", flags='f', type="rast", pattern="register_map_1,register_map_2", quiet=True)
self.strds_abs.delete()
self.strds_rel.delete()
Modified: grass/trunk/raster/r.category/test_rcategory_doctest.txt
===================================================================
--- grass/trunk/raster/r.category/test_rcategory_doctest.txt 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.category/test_rcategory_doctest.txt 2014-09-17 16:24:34 UTC (rev 62015)
@@ -231,9 +231,9 @@
when test finishes. It could test if everything which was expected
to be created was created if it would check all outputs properly.
->>> run_command('g.remove', rast='test')
+>>> run_command('g.remove', flags='f', type='rast', pattern='test')
0
->>> run_command('g.remove', rast='test_14')
+>>> run_command('g.remove', flags='f', type='rast', pattern='test_14')
0
->>> run_command('g.remove', rast='test_d')
+>>> run_command('g.remove', flags='f', type='rast', pattern='test_d')
0
Modified: grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.li/r.li.setup/masked_area_selection.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -104,7 +104,7 @@
eval `g.findfile elem=windows file="tmp_rli_selmsk.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_selmsk.$$"
- g.remove region="tmp_rli_selmsk.$$" --quiet
+ g.remove -f type=region pattern="tmp_rli_selmsk.$$" --quiet
fi
rm -f "$TMP" "$TMP".val
@@ -190,8 +190,8 @@
"$GIS_OPT_conf"
# remove tmp raster and vector
- g.remove rast="tmp_rli_mask.$$" --quiet
- g.remove vect="tmp_rli_mask_v$$" --quiet
+ g.remove -f type=rast pattern="tmp_rli_mask.$$" --quiet
+ g.remove -f type=vect pattern="tmp_rli_mask_v$$" --quiet
if [ "$GIS_FLAG_f" -eq 1 ] ; then
g.region n="$GIS_OPT_north" s="$GIS_OPT_south" \
Modified: grass/trunk/raster/r.li/r.li.setup/r.li.setup
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/r.li.setup 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.li/r.li.setup/r.li.setup 2014-09-17 16:24:34 UTC (rev 62015)
@@ -33,7 +33,7 @@
eval `g.findfile elem=windows file="tmp_rlisetup.$$" | grep '^name='`
if [ -n "$name" ] ; then
unset WIND_OVERRIDE
- g.remove region="tmp_rlisetup.$$" --quiet
+ g.remove -f type=region pattern="tmp_rlisetup.$$" --quiet
fi
}
trap "cleanup" 2 3 15
Modified: grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -71,7 +71,7 @@
eval `g.findfile elem=windows file="tmp_rli_sampvect.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_sampvect.$$"
- g.remove region="tmp_rli_sampvect.$$" --quiet
+ g.remove -f type=region pattern="tmp_rli_sampvect.$$" --quiet
fi
rm -f "$TMP"*
@@ -184,12 +184,12 @@
echo "MASKEDOVERLAYAREA $mask_name|$n|$s|$e|$w" >> "$GIS_OPT_conf"
elif [ "$ok" -eq -1 ] ; then
- g.remove vect="$EXTRACT" --quiet
+ g.remove -f type=vect pattern="$EXTRACT" --quiet
break
fi
#remove temporary vector map created from v.extract
- g.remove vect="$EXTRACT" --quiet
+ g.remove -f type=vect pattern="$EXTRACT" --quiet
done < "$TMP.cat"
Modified: grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -90,7 +90,7 @@
eval `g.findfile elem=windows file="tmp_rli_sq.$$" | grep '^name='`
if [ -n "$name" ] ; then
g.region region="tmp_rli_sq.$$"
- g.remove region="tmp_rli_sq.$$" --quiet
+ g.remove -f type=region pattern="tmp_rli_sq.$$" --quiet
fi
rm -f "$TMP" "$TMP.var"
Modified: grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.mapcalc/testsuite/const_map_test.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -43,7 +43,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove rast=$TMPNAME > /dev/null
+ g.remove -f type=rast pattern=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -59,11 +59,11 @@
{
echo "Restoring user region"
g.region region=$TMPNAME
- g.remove region=$TMPNAME > /dev/null
+ g.remove -f type=region pattern=$TMPNAME > /dev/null
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove rast=MASK > /dev/null
+ g.remove -f type=rast pattern=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py
===================================================================
--- grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.mapcalc/testsuite/test_r_mapcalc.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -72,7 +72,8 @@
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
- cls.runModule('g.remove', rast=','.join(cls.to_remove))
+ cls.runModule('g.remove', flags='f', type='rast',
+ pattern=','.join(cls.to_remove))
def rinfo_contains_number(self, raster, number):
"""Test that r.info stdandard output for raster contains a given number
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.out.mpeg/main.c 2014-09-17 16:24:34 UTC (rev 62015)
@@ -398,7 +398,7 @@
sprintf(pattern_arg, "pattern=%s", wildarg);
sprintf(mapset_arg, "mapset=%s", mapset);
- G_spawn_ex("g.mlist", "g.mlist",
+ G_spawn_ex("g.list", "g.list",
type_arg, pattern_arg, mapset_arg,
SF_REDIRECT_FILE, SF_STDOUT, SF_MODE_APPEND, outfile,
NULL);
Modified: grass/trunk/raster/r.patch/r.patch.html
===================================================================
--- grass/trunk/raster/r.patch/r.patch.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.patch/r.patch.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -85,7 +85,7 @@
used in the order listed.
<div class="code"><pre>
-MAPS=`g.mlist type=rast sep=, pat="map_*"`
+MAPS=`g.list type=rast sep=, pat="map_*"`
g.region rast=$MAPS
r.patch in=$MAPS out=mosaic
</pre></div>
Modified: grass/trunk/raster/r.reclass/r.reclass.html
===================================================================
--- grass/trunk/raster/r.reclass/r.reclass.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.reclass/r.reclass.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -69,7 +69,7 @@
raster map layer from which a <em>r.reclass</em> has been derived
is only possible if the original map is removed first.
Alternatively, a <em>r.reclass</em> map can be removed including
-its base map by using <p><em><a href="g.mremove.html">g.mremove</a></em>'s
+its base map by using <p><em><a href="g.remove.html">g.remove</a></em>'s
<b>-b</b> flag.
<p>A <em>r.reclass</em> map is not a true raster map layer.
Modified: grass/trunk/raster/r.series/r.series.html
===================================================================
--- grass/trunk/raster/r.series/r.series.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.series/r.series.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -84,10 +84,10 @@
Using <em>r.series</em> with wildcards:
<br>
<div class="code"><pre>
-r.series input="`g.mlist pattern='insitu_data.*' sep=,`" \
+r.series input="`g.list pattern='insitu_data.*' sep=,`" \
output=insitu_data.stddev method=stddev
</pre></div>
-<p>Note the <em>g.mlist</em> script also supports regular expressions for
+<p>Note the <em>g.list</em> script also supports regular expressions for
selecting map names.
<p>Using <em>r.series</em> with NULL raster maps:
<br>
@@ -131,11 +131,11 @@
daily average maps ('???' as DOY wildcard):
<div class="code"><pre>
# Approach for shell based systems
-r.series input=`g.mlist rast pattern="temp_2003_???_avg" sep=,` \
+r.series input=`g.list rast pattern="temp_2003_???_avg" sep=,` \
output=temp_2003_days_over_25deg range=25.0,100.0 method=count
# Approach in two steps (e.g., for Windows systems)
-g.mlist rast pattern="temp_2003_???_avg" output=mapnames.txt
+g.list rast pattern="temp_2003_???_avg" output=mapnames.txt
r.series file=mapnames.txt \
output=temp_2003_days_over_25deg range=25.0,100.0 method=count
</pre></div>
@@ -143,7 +143,7 @@
<h2>SEE ALSO</h2>
-<em><a href="g.mlist.html">g.mlist</a></em>,
+<em><a href="g.list.html">g.list</a></em>,
<em><a href="g.region.html">g.region</a></em>
<h2>AUTHOR</h2>
Modified: grass/trunk/raster/r.series.accumulate/r.series.accumulate.html
===================================================================
--- grass/trunk/raster/r.series.accumulate/r.series.accumulate.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.series.accumulate/r.series.accumulate.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -125,7 +125,7 @@
<em>
<a href="r.series.html">r.series</a>,
-<a href="g.mlist.html">g.mlist</a>,
+<a href="g.list.html">g.list</a>,
<a href="g.region.html">g.region</a>
</em>
Modified: grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh
===================================================================
--- grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.series.accumulate/test_suite/test.r.series.accumulate.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -51,7 +51,7 @@
output=test_accu_9 range=6,9 method=mean --verbose
# Test for correct results
-for map in `g.mlist type=rast pattern=test_accu_*` ; do
+for map in `g.list type=rast pattern=test_accu_*` ; do
r.out.ascii input=${map} output=${map}.ref dp=2
done
@@ -62,4 +62,4 @@
CHAR_NUM=`cat out.diff | wc -c`
# Return as exit status 0 in case no diffs are found
-exit $CHAR_NUM
\ No newline at end of file
+exit $CHAR_NUM
Modified: grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py
===================================================================
--- grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.slope.aspect/testsuite/test_r_slope_aspect.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -68,7 +68,7 @@
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
- cls.runModule('g.remove', rast=cls.elevation)
+ cls.runModule('g.remove', flags='f', type='rast', pattern=cls.elevation)
def test_slope(self):
ref_slope = 'reference_slope'
Modified: grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh
===================================================================
--- grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.to.rast3elev/test.r.to.rast3elev.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -45,4 +45,4 @@
# r.to.rast3elev --o -lu input=elev_25_double,elev_5_double elevation=elev_25_double,elev_5_double output=test_elev_volume_double_9
# Export of the references
-# for i in `g.mlist type=rast3d pattern=test_elev_volume_*` ; do r3.out.ascii dp=0 input=$i output=${i}.ref; done
+# for i in `g.list type=rast3d pattern=test_elev_volume_*` ; do r3.out.ascii dp=0 input=$i output=${i}.ref; done
Modified: grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py
===================================================================
--- grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.viewshed/testsuite/test_r_viewshed.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -37,7 +37,7 @@
@classmethod
def tearDownClass(cls):
cls.del_temp_region()
- cls.runModule('g.remove', rast=cls.elevation)
+ cls.runModule('g.remove', flags='f', type='rast', pattern=cls.elevation)
def test_viewshed(self):
ref_viewshed = 'reference_viewshed'
Modified: grass/trunk/raster/r.watershed/front/r.watershed.html
===================================================================
--- grass/trunk/raster/r.watershed/front/r.watershed.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/r.watershed/front/r.watershed.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -422,7 +422,7 @@
abs(rwater.accum), \
null() )"
r.colors -g rwater.course col=bcyr
- g.remove MASK
+ g.remove -f type=rast pattern=MASK
# <i>Thinning is required before converting raster lines to vector</i>
r.thin in=rwater.course out=rwater.course.Thin
Modified: grass/trunk/raster/simwe/r.sim.water/spearfish.sh
===================================================================
--- grass/trunk/raster/simwe/r.sim.water/spearfish.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster/simwe/r.sim.water/spearfish.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -41,14 +41,14 @@
r.out.vtk elevation=${dem} input=${output}_manin,soils vectormaps=${output}_dx,${output}_dy,${output}_null output=manning_soils_gradient.vtk null=0.0
echo "Build topology and exporting walker vector points for each time step"
-for i in `g.mlist vect | grep ${output}` ; do
+for i in `g.list vect | grep ${output}` ; do
v.build $i
echo "v.out.vtk input=$i output=$i.vtk"
v.out.vtk input=$i output=$i.vtk
done
echo "Exporting the raster maps for each time step"
-for i in `g.mlist rast | grep ${output}` ; do
+for i in `g.list rast | grep ${output}` ; do
echo "r.out.vtk elevation=${dem} input=$i output=$i.vtk null=0.0"
r.out.vtk elevation=${dem} input=$i output=$i.vtk null=0.0
done
@@ -57,5 +57,5 @@
echo "Step throu the time steps and adjust the color tables"
# cleanup
-g.remove --q rast=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
-g.remove --q vect=observation_points
+g.remove --q -f type=rast pattern=${output}_dx,${output}_dy,${output}_rain,${output}_manin,${output}_infil,${output}_null
+g.remove --q -f type=vect pattern=observation_points
Modified: grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.cross.rast/test.r3.cross.rast.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -34,7 +34,7 @@
r3.cross.rast --o input=volume_null elevation=elev_cross output=test_cross_section_result
# Export of the text files
-for i in `g.mlist type=rast pattern=test_cross_section_*` ; do
+for i in `g.list type=rast pattern=test_cross_section_*` ; do
r.out.ascii input=$i output=${i}.txt;
done
Modified: grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py
===================================================================
--- grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.flow/testsuite/r3flow_test.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -54,8 +54,8 @@
def tearDownClass(cls):
"""!Remove the temporary region"""
cls.del_temp_region()
- cls.runModule('g.remove', rast3d=['map_1', 'map_2', 'map_3', 'map_4', 'map_5', 'test_flowaccum'])
- cls.runModule('g.remove', vect=['test_flowline', 'test_seeds'])
+ cls.runModule('g.remove', flags='f', type='rast3d', pattern=['map_1', 'map_2', 'map_3', 'map_4', 'map_5', 'test_flowaccum'])
+ cls.runModule('g.remove', flags='f', type='vect', pattern=['test_flowline', 'test_seeds'])
os.remove('./data/flowline_tmp.ascii')
def test_interpolation(self):
Modified: grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py
===================================================================
--- grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.gradient/testsuite/r3gradient_test.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -114,7 +114,8 @@
def tearDownClass(cls):
"""!Remove the temporary region"""
cls.del_temp_region()
- cls.runModule('g.remove', rast3d=['test_map_1_ref', 'test_map_2_ref', 'test_grad_x',
+ cls.runModule('g.remove', flags='f', type='rast3d',
+ pattern=['test_map_1_ref', 'test_map_2_ref', 'test_grad_x',
'test_grad_y', 'test_grad_z', 'test_null_grad_x',
'test_null_grad_y', 'test_null_grad_z'])
Modified: grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh
===================================================================
--- grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.in.bin/test_suite/test.r3.in.bin.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -124,7 +124,7 @@
bottom=0 top=100 west=0 east=180 south=0 north=90 \
cols=18 rows=9 depths=10
-for map in `g.mlist type=rast3d pattern=test_in_bin_float*` ; do
+for map in `g.list type=rast3d pattern=test_in_bin_float*` ; do
r3.out.ascii input=${map} output=${map}.txt dp=0
done
@@ -132,7 +132,7 @@
diff $i test_out_bin_float.ref
done
-g.mremove -f rast3d=test_in*
-g.mremove -f rast3d=test_out*
+g.remove -f type=rast3d pattern=test_in*
+g.remove -f type=rast3d pattern=test_out*
rm test_in_*.txt
rm test_out_*.bin
Modified: grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh
===================================================================
--- grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.out.netcdf/test_suite/test.r3.out.netcdf.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -31,4 +31,4 @@
r3.info volume_time_float
ncdump -h test_time_float.nc
-g.remove rast3=volume_float,volume_double,volume_time_double,volume_time_float
\ No newline at end of file
+g.remove -f type=rast3 pattern=volume_float,volume_double,volume_time_double,volume_time_float
Modified: grass/trunk/raster3d/r3.retile/test.r3.retile.sh
===================================================================
--- grass/trunk/raster3d/r3.retile/test.r3.retile.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.retile/test.r3.retile.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -36,7 +36,7 @@
r3.info -g map=test_retile_map_10 > test_retile_map_10_info.txt
# Create the validation files
-for map in `g.mlist type=rast3d pattern=test_retile_map_*` ; do
+for map in `g.list type=rast3d pattern=test_retile_map_*` ; do
r3.out.ascii input=${map} output=${map}.txt dp=0
done
Modified: grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh
===================================================================
--- grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/raster3d/r3.to.rast/test.r3.to.rast.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -21,8 +21,8 @@
r3.to.rast --o input=volume_null_float output=test_raster_slice_float
# Export of the references
-for i in `g.mlist type=rast pattern=test_raster_slice_1*` ; do r.out.ascii input=$i output=${i}.txt; done
-for i in `g.mlist type=rast pattern=test_raster_slice_float*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=rast pattern=test_raster_slice_1*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=rast pattern=test_raster_slice_float*` ; do r.out.ascii input=$i output=${i}.txt; done
# The next @preprocess step adjusts the raster region to increase the resolution by 2
g.region res=7.5 -p3
@@ -32,7 +32,7 @@
r3.to.rast --o input=volume_null output=test_raster_slice_2
# Export of the references
-for i in `g.mlist type=rast pattern=test_raster_slice_2*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=rast pattern=test_raster_slice_2*` ; do r.out.ascii input=$i output=${i}.txt; done
# The next @preprocess step adjusts the raster region to increase the resolution by 2 again
g.region res=5 -p3
@@ -42,7 +42,7 @@
r3.to.rast --o input=volume_null output=test_raster_slice_3
# Export of the references
-for i in `g.mlist type=rast pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.txt; done
+for i in `g.list type=rast pattern=test_raster_slice_3*` ; do r.out.ascii input=$i output=${i}.txt; done
# Comparison of references and text files
for i in `ls *.ref` ; do
Modified: grass/trunk/scripts/d.rast.edit/d.rast.edit.py
===================================================================
--- grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/d.rast.edit/d.rast.edit.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -495,7 +495,7 @@
def cleanup(self):
grass.try_remove(self.tempfile)
- run('g.remove', rast = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
def finalize(self):
self.save_map()
@@ -529,7 +529,7 @@
run('g.region', rast = self.inmap)
run('r.patch', input = (self.tempmap, self.outmap), output = self.outmap, overwrite = True)
run('r.colors', map = self.outmap, rast = self.inmap)
- run('g.remove', rast = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
def read_header(self, infile):
wind = {}
@@ -635,7 +635,7 @@
run('r.mapcalc', expression = "%s = %d" % (self.tempmap, val))
run('r.colors', map = self.tempmap, rast = self.inmap)
run('r.out.ppm', input = self.tempmap, out = self.tempfile)
- run('g.remove', rast = self.tempmap)
+ run('g.remove', flags = 'f', type = 'rast', pattern = self.tempmap)
tempimg = wx.Image(self.tempfile)
grass.try_remove(self.tempfile)
Modified: grass/trunk/scripts/d.shadedmap/d.shadedmap.py
===================================================================
--- grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/d.shadedmap/d.shadedmap.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -60,8 +60,8 @@
r_map = tmp_r, g_map = tmp_g, b_map = tmp_b)
grass.run_command('r.composite', red = tmp_r, green = tmp_g,
blue = tmp_b, output = output_map)
- grass.run_command('g.remove', quiet = True,
- rast = '%s,%s,%s' % (tmp_r, tmp_g, tmp_b))
+ grass.run_command('g.remove', flags = 'f', quiet = True, type='rast',
+ pattern = '%s,%s,%s' % (tmp_r, tmp_g, tmp_b))
ret = grass.run_command("d.his", h_map = drape_map, i_map = relief_map,
Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -108,7 +108,7 @@
else:
# remove the vector part
grass.run_command('v.db.connect', quiet = True, map = output, layer = '1', flags = 'd')
- grass.run_command('g.remove', quiet = True, vect = output)
+ grass.run_command('g.remove', flags = 'f', quiet = True, type = 'vect', pattern = output)
# get rid of superfluous auto-added cat column (and cat_ if present)
nuldev = file(os.devnull, 'w+')
Modified: grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py
===================================================================
--- grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/i.in.spotvgt/i.in.spotvgt.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -177,7 +177,7 @@
grass.message(_("Remapping digital numbers to NDVI..."))
tmpname = "%s_%s" % (name, pid)
grass.mapcalc("$tmpname = 0.004 * $name - 0.1", tmpname = tmpname, name = name)
- grass.run_command('g.remove', rast = name, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast', pattern = name, quiet = True)
grass.run_command('g.rename', rast = (tmpname, name), quiet = True)
# write cmd history:
Modified: grass/trunk/scripts/i.pansharpen/i.pansharpen.py
===================================================================
--- grass/trunk/scripts/i.pansharpen/i.pansharpen.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/i.pansharpen/i.pansharpen.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -175,7 +175,8 @@
# Cleanup
- grass.run_command('g.remove', quiet=True, rast='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
+ grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ pattern='%s,%s,%s' % (panmatch1, panmatch2, panmatch3))
elif sharpen == "ihs":
grass.verbose(_("Using IHS<->RGB algorithm"))
@@ -205,7 +206,8 @@
blue_output="%s_blue" % out)
# Cleanup
- grass.run_command('g.remove', quiet=True, rast=panmatch)
+ grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ pattern=panmatch)
elif sharpen == "pca":
grass.verbose(_("Using PCA/inverse PCA algorithm"))
@@ -299,7 +301,8 @@
# Cleanup
- grass.run_command('g.mremove', flags='f', quiet=True, type="rast", pattern='tmp%s*,%s' % (pid,panmatch))
+ grass.run_command('g.remove', flags='f', quiet=True, type="rast",
+ pattern='tmp%s*,%s' % (pid,panmatch))
#Could add other sharpening algorithms here, e.g. wavelet transformation
@@ -335,7 +338,8 @@
grass.raster_history("%s_%s" % (out, ch))
# Cleanup
- grass.run_command('g.mremove', flags="f", type="rast", pattern="tmp%s*" % pid, quiet=True)
+ grass.run_command('g.remove', flags="f", type="rast",
+ pattern="tmp%s*" % pid, quiet=True)
def matchhist(original, target, matched):
@@ -417,7 +421,8 @@
# create reclass of target from reclass rules file
result = grass.core.find_file(matched, element = 'cell')
if result['fullname']:
- grass.run_command('g.remove', quiet=True, rast=matched)
+ grass.run_command('g.remove', flags='f', quiet=True, type='rast',
+ pattern=matched)
grass.run_command('r.reclass', input=original, out=matched, rules=outfile.name)
else:
grass.run_command('r.reclass', input=original, out=matched, rules=outfile.name)
Modified: grass/trunk/scripts/i.spectral/i.spectral.html
===================================================================
--- grass/trunk/scripts/i.spectral/i.spectral.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/i.spectral/i.spectral.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -29,7 +29,7 @@
<div class="code"><pre>
g.region rast=lsat7_2002_10 -p
-LIST=`g.mlist type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
+LIST=`g.list type=rast pattern="lsat7_2002_[1-5,7]0" separator=","`
i.spectral raster=$LIST coordinates=637502.25,221744.25
</pre></div>
Modified: grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py
===================================================================
--- grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.buffer.lowmem/r.buffer.lowmem.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -58,9 +58,9 @@
# what to do in case of user break:
def cleanup():
if grass.find_file(temp_src)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'f', rast = temp_src)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = temp_src)
if grass.find_file(temp_dist)['file']:
- grass.run_command('g.remove', quiet = True, flags = 'f', rast = temp_dist)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = temp_dist)
def main():
global temp_dist, temp_src
Modified: grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py
===================================================================
--- grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.colors.stddev/r.colors.stddev.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -40,7 +40,8 @@
def cleanup():
if tmpmap:
- grass.run_command('g.remove', rast = tmpmap, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast',
+ pattern = tmpmap, quiet = True)
def main():
global tmpmap
Modified: grass/trunk/scripts/r.fillnulls/r.fillnulls.py
===================================================================
--- grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.fillnulls/r.fillnulls.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -100,9 +100,9 @@
def cleanup():
#delete internal mask and any TMP files:
if len(tmp_vmaps) > 0:
- grass.run_command('g.remove', quiet = True, flags = 'f', vect = tmp_vmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'vect', pattern = tmp_vmaps)
if len(tmp_rmaps) > 0:
- grass.run_command('g.remove', quiet = True, flags = 'f', rast = tmp_rmaps)
+ grass.run_command('g.remove', quiet = True, flags = 'fb', type = 'rast', pattern = tmp_rmaps)
if usermask and mapset:
if grass.find_file(usermask, mapset = mapset)['file']:
grass.run_command('g.rename', quiet = True, rast = (usermask, 'MASK'), overwrite = True)
@@ -233,7 +233,7 @@
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
# remove temporary map to not overfill disk
- if grass.run_command('g.remove', flags = 'f', vect = holename + '_pol', quiet = quiet) != 0:
+ if grass.run_command('g.remove', flags = 'fb', type = 'vect', pattern = holename + '_pol', quiet = quiet) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
tmp_vmaps.remove(holename + '_pol')
@@ -325,14 +325,14 @@
tmp_rmaps.remove(holename + '_dem')
except:
pass
- if grass.run_command('g.remove', quiet = quiet, flags = 'f', rast =
+ if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'rast', pattern =
(holename, holename + '_grown', holename + '_edges', holename + '_dem')) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
try:
tmp_vmaps.remove(holename)
except:
pass
- if grass.run_command('g.remove', quiet = quiet, flags = 'f', vect = holename) != 0:
+ if grass.run_command('g.remove', quiet = quiet, flags = 'fb', type = 'vect', pattern = holename) != 0:
grass.fatal(_("abandoned. Removing temporary maps, restoring user mask if needed:"))
#check if method is different from rst to use r.resamp.bspline
Modified: grass/trunk/scripts/r.grow/r.grow.py
===================================================================
--- grass/trunk/scripts/r.grow/r.grow.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.grow/r.grow.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -68,7 +68,8 @@
def cleanup():
for map in [temp_dist, temp_val]:
if map:
- grass.run_command('g.remove', quiet = True, flags = 'f', rast = map)
+ grass.run_command('g.remove', flags = 'fb', quiet = True,
+ type='rast', pattern = map)
def main():
global temp_dist, temp_val
Modified: grass/trunk/scripts/r.in.wms/wms_base.py
===================================================================
--- grass/trunk/scripts/r.in.wms/wms_base.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.in.wms/wms_base.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -463,8 +463,9 @@
if maps:
grass.run_command('g.remove',
quiet = True,
- flags = 'f',
- rast = ','.join(maps))
+ flags = 'fb',
+ type = 'rast',
+ pattern = ','.join(maps))
# delete environmental variable which overrides region
if 'GRASS_REGION' in os.environ.keys():
Modified: grass/trunk/scripts/r.mask/r.mask.py
===================================================================
--- grass/trunk/scripts/r.mask/r.mask.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.mask/r.mask.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -73,9 +73,11 @@
def cleanup():
if tmp:
- grass.run_command('g.remove', rast = tmp, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast',
+ pattern = tmp, quiet = True)
if tmp_hull:
- grass.run_command('g.remove', vect = tmp_hull, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'vect',
+ pattern = tmp_hull, quiet = True)
def main():
raster = options['raster']
@@ -96,7 +98,8 @@
if remove:
# -> remove
if exists:
- grass.run_command('g.remove', quiet = True, rast = 'MASK')
+ grass.run_command('g.remove', flags = 'f', quiet = True,
+ type = 'rast', pattern = 'MASK')
grass.message(_("Raster MASK removed"))
else:
grass.fatal(_("No existing MASK to remove"))
@@ -107,7 +110,8 @@
grass.fatal(_("MASK already found in current mapset. Delete first or overwrite."))
else:
grass.warning(_("MASK already exists and will be overwritten"))
- grass.run_command('g.remove', quiet = True, rast = 'MASK')
+ grass.run_command('g.remove', flags = 'f', quiet = True,
+ type = 'rast', pattern = 'MASK')
if raster:
# check if input raster exists
Modified: grass/trunk/scripts/r.reclass.area/r.reclass.area.py
===================================================================
--- grass/trunk/scripts/r.reclass.area/r.reclass.area.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.reclass.area/r.reclass.area.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -164,7 +164,7 @@
"""!Delete temporary maps"""
TMPRAST.reverse() # reclassed map first
for rast in TMPRAST:
- grass.run_command("g.remove", rast=rast, quiet=True)
+ grass.run_command("g.remove", flags='f', type='rast', pattern=rast, quiet=True)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh
===================================================================
--- grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r.unpack/test_suite/test.r.unpack.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -21,7 +21,7 @@
r.pack --o --v -c input=test_double output=test_double_uncompressed.pack
# Remove generated maps and re-import
-g.remove rast=test_int,test_float,test_double
+g.remove -f type=rast pattern=test_int,test_float,test_double
# Second we check the import with r.unpack
r.unpack --o --v input=test_int.pack
@@ -42,5 +42,5 @@
#r.out.ascii --o input=test_float_uncompressed output=test_float_uncompressed.ref dp=1
#r.out.ascii --o input=test_double_uncompressed output=test_double_uncompressed.ref dp=1
-g.remove rast=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
-rm *.pack
\ No newline at end of file
+g.remove -f type=rast pattern=test_int,test_float,test_double,test_int_uncompressed,test_float_uncompressed,test_double_uncompressed
+rm *.pack
Modified: grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py
===================================================================
--- grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/r3.in.xyz/r3.in.xyz.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -178,7 +178,7 @@
def cleanup():
- grass.run_command('g.mremove', flags = 'f',
+ grass.run_command('g.remove', flags = 'f',
type = "rast", pattern = 'tmp.r3xyz.%d.*' % os.getpid(),
quiet = True)
@@ -310,7 +310,7 @@
grass.verbose(_("Assembling 3D cube ..."))
#input order: lower most strata first
- slices = grass.read_command('g.mlist', type = 'rast', sep = ',',
+ slices = grass.read_command('g.list', type = 'rast', sep = ',',
pattern = 'tmp.r3xyz.%d.*' % os.getpid()).rstrip('\n')
grass.debug(slices)
Modified: grass/trunk/scripts/v.dissolve/v.dissolve.html
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -50,7 +50,7 @@
<div class="code"><pre>
# patch tiles after import:
-v.patch -e `g.mlist type=vect pat="clc2000_*" separator=","` out=clc2000_patched
+v.patch -e `g.list type=vect pat="clc2000_*" separator=","` out=clc2000_patched
# remove duplicated tile boundaries:
v.clean clc2000_patched out=clc2000_clean tool=snap,break,rmdupl thresh=.01
Modified: grass/trunk/scripts/v.dissolve/v.dissolve.py
===================================================================
--- grass/trunk/scripts/v.dissolve/v.dissolve.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.dissolve/v.dissolve.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -40,7 +40,7 @@
def cleanup():
nuldev = file(os.devnull, 'w')
- grass.run_command('g.remove', vect = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
+ grass.run_command('g.remove', flags = 'f', type = 'vect', pattern = '%s_%s' % (output, tmp), quiet = True, stderr = nuldev)
def main():
global output, tmp
Modified: grass/trunk/scripts/v.out.gps/v.out.gps.py
===================================================================
--- grass/trunk/scripts/v.out.gps/v.out.gps.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.out.gps/v.out.gps.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -99,10 +99,12 @@
# only try to remove map if it exists to avoid ugly warnings
if tmp_vogb:
if grass.find_file(tmp_vogb, element = 'vector')['name']:
- grass.run_command('g.remove', vect = tmp_vogb, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'vect'
+ pattern = tmp_vogb, quiet = True)
if tmp_extr:
if grass.find_file(tmp_extr, element = 'vector')['name']:
- grass.run_command('g.remove', vect = tmp_vogb, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'vect',
+ pattern = tmp_vogb, quiet = True)
tmp = None
tmp_proj = None
Modified: grass/trunk/scripts/v.rast.stats/v.rast.stats.py
===================================================================
--- grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.rast.stats/v.rast.stats.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -69,8 +69,10 @@
def cleanup():
if rastertmp:
- grass.run_command('g.remove', rast=rastertmp, quiet=True)
- grass.run_command('g.remove', rast='MASK', quiet=True, stderr=nuldev)
+ grass.run_command('g.remove', flags='f', type='rast',
+ pattern=rastertmp, quiet=True)
+ grass.run_command('g.remove', flags='f', type='rast',
+ pattern='MASK', quiet=True, stderr=nuldev)
if mask_found:
grass.message(_("Restoring previous MASK..."))
grass.run_command('g.rename', rast=(tmpname + "_origmask", 'MASK'),
@@ -279,7 +281,8 @@
exitcode = grass.run_command('db.execute', input=sqltmp,
database=fi['database'], driver=fi['driver'])
- grass.run_command('g.remove', rast='MASK', quiet=True, stderr=nuldev)
+ grass.run_command('g.remove', flags='f', type='rast',
+ pattern='MASK', quiet=True, stderr=nuldev)
if exitcode == 0:
grass.verbose((_("Statistics calculated from raster map <%s>") % raster) +
Modified: grass/trunk/scripts/v.to.lines/v.to.lines.py
===================================================================
--- grass/trunk/scripts/v.to.lines/v.to.lines.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.to.lines/v.to.lines.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -89,22 +89,26 @@
if 0 != grass.run_command('v.category', layer="2", type='boundary',
option='add', input=input, out=input_tmp,
quiet=quiet):
- grass.run_command('g.remove', vect=input_tmp, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=input_tmp, quiet=quiet)
grass.fatal(_("Error creating layer 2"))
if 0 != grass.run_command('v.db.addtable', map=input_tmp, layer="2",
columns="left integer,right integer",
quiet=quiet):
- grass.run_command('g.remove', vect=input_tmp, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=input_tmp, quiet=quiet)
grass.fatal(_("Error creating new table for layer 2"))
if 0 != grass.run_command('v.to.db', map=input_tmp, option="sides",
columns="left,right", layer="2", quiet=quiet):
- grass.run_command('g.remove', vect=input_tmp, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=input_tmp, quiet=quiet)
grass.fatal(_("Error populating new table for layer 2"))
if 0 != grass.run_command('v.type', input=input_tmp, output=out_type,
from_type='boundary', to_type='line',
quiet=quiet, layer="2"):
- grass.run_command('g.remove', vect=remove_names, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=remove_names, quiet=quiet)
grass.fatal(_("Error converting polygon to line"))
report = grass.read_command('v.category', flags='g', input=out_type,
option='report', quiet=quiet).split('\n')
@@ -117,24 +121,29 @@
if 0 != grass.run_command('v.edit', map=out_type, tool='delete',
type='centroid', layer=2, quiet=quiet,
cats='{mi}-{ma}'.format(mi=min_cat, ma=max_cat)):
- grass.run_command('g.remove', vect=remove_names, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=remove_names, quiet=quiet)
grass.fatal(_("Error removing centroids"))
try:
if 0 != grass.run_command('v.db.droptable', map=out_type, layer=1,
flags='f', quiet=True):
- grass.run_command('g.remove', vect=remove_names, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=remove_names, quiet=quiet)
grass.fatal(_("Error removing table from layer 1"))
except:
grass.warning(_("No table for layer %d" % 1))
if 0 != grass.run_command('v.category', input=out_type, option='transfer',
output=output, layer="2,1", quiet=quiet,
overwrite=overwrite):
- grass.run_command('g.remove', vect=remove_names, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=remove_names, quiet=quiet)
grass.fatal(_("Error adding categories"))
- grass.run_command('g.remove', vect=remove_names, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=remove_names, quiet=quiet)
if point:
- grass.run_command('g.remove', vect=out_temp, quiet=quiet)
+ grass.run_command('g.remove', flags='f', type='vect',
+ pattern=out_temp, quiet=quiet)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh
===================================================================
--- grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.unpack/test_suite/test.v.unpack.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -19,7 +19,7 @@
db.copy from_table=probe_orig to_table=probe_3_3
# Removing un-needed vectors and tables
-g.remove vect=probe_orig
+g.remove -f type=vect pattern=probe_orig
v.db.droptable -f map=probe_3 table=probe_3 layer=1
# Adding tables to layer
@@ -37,7 +37,7 @@
v.pack --o -c input=probe_3 output=probe_3_uncompressed.pack
# We need to clean before import
-g.remove vect=probe_1,probe_2,probe_3
+g.remove -f type=vect pattern=probe_1,probe_2,probe_3
# Test the import with v.unpack
v.unpack --o input=probe_1.pack
@@ -55,5 +55,5 @@
v.unpack --o input=probe_3.pack output=probe_3_uncompressed
v.category input=probe_3_uncompressed option=report
-g.remove vect=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
+g.remove -f type=vect pattern=probe_1_uncompressed,probe_2_uncompressed,probe_3_uncompressed
rm *.pack
Modified: grass/trunk/scripts/v.unpack/v.unpack.py
===================================================================
--- grass/trunk/scripts/v.unpack/v.unpack.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/scripts/v.unpack/v.unpack.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -90,7 +90,8 @@
grass.fatal(_("Vector map <%s> already exists") % map_name)
elif overwrite == '1' and gfile['file']:
grass.warning(_("Vector map <%s> already exists and will be overwritten") % map_name)
- grass.run_command('g.remove', quiet=True, vect=map_name)
+ grass.run_command('g.remove', flags='f', quiet=True, type='vect',
+ pattern=map_name)
shutil.rmtree(new_dir, True)
# extract data
Modified: grass/trunk/temporal/t.list/t.list.html
===================================================================
--- grass/trunk/temporal/t.list/t.list.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.list/t.list.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -47,7 +47,6 @@
<em>
<a href="g.list.html">g.list</a>,
-<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.rast.list.html">t.rast.list</a>,
Modified: grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh
===================================================================
--- grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.merge/testsuite/test.t.merge.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -49,4 +49,4 @@
t.remove type=strds input=precip_abs1,precip_abs2,precip_abs3,precip_abs4
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -418,7 +418,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.mremove", type="rast", pattern=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="rast", pattern=map.get_name(), quiet=True)
############################################################################
Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -500,7 +500,7 @@
# Remove empty maps
if len(empty_maps) > 0:
for map in empty_maps:
- grass.run_command("g.mremove", type="rast", pattern=map.get_name(), quiet=True)
+ grass.run_command("g.remove", flags='f', type="rast", pattern=map.get_name(), quiet=True)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.gapfill/test.t.rast.gapfill.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -31,4 +31,4 @@
t.unregister --v type=rast maps=prec_1,prec_2,prec_3,prec_6,prec_7
t.remove --v type=strds input=precip_abs
-g.remove rast=prec_1,prec_2,prec_3,prec_6,prec_7
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_6,prec_7
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.relative.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -75,7 +75,7 @@
# Cleaning up
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_rel
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -74,7 +74,7 @@
# Cleaning up
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export.tar.gz
Modified: grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh
===================================================================
--- grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.import/test.t.rast.import_locations.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -59,7 +59,7 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
rm -rf test
rm strds_export.tar.bz2
rm strds_export_pack.tar.gz
Modified: grass/trunk/temporal/t.rast.list/t.rast.list.html
===================================================================
--- grass/trunk/temporal/t.rast.list/t.rast.list.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.list/t.rast.list.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -168,7 +168,6 @@
<em>
<a href="g.list.html">g.list</a>,
-<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.mapcalc/test.t.rast.mapcalc.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -47,7 +47,7 @@
t.info type=strds input=precip_abs4
# Let the test fail
-g.remove rast=prec_1
+g.remove -f type=rast pattern=prec_1
t.rast.mapcalc -sn inputs=precip_abs1,precip_abs2 output=precip_abs4 \
expression=" (precip_abs1 + precip_abs2) * null()" base=new_prec \
method=equal nprocs=5
Modified: grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
===================================================================
--- grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -185,7 +185,7 @@
else:
names += ",%s" % (map.get_name())
- grass.run_command("g.remove", rast=names, quiet=True)
+ grass.run_command("g.remove", flags='f', type='rast', pattern=names, quiet=True)
dbif.close()
Modified: grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py
===================================================================
--- grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.out.vtk/t.rast.out.vtk.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -144,8 +144,8 @@
count += 1
if use_granularity:
- grass.run_command("g.remove", rast=null_map)
- grass.run_command("g.remove", rast=map_name)
+ grass.run_command("g.remove", flags='f', type='rast', pattern=null_map)
+ grass.run_command("g.remove", flags='f', type='rast', pattern=map_name)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.rast.series/test.t.rast.series.sh
===================================================================
--- grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.series/test.t.rast.series.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -32,4 +32,4 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6,prec_sum,prec_max
t.remove type=strds input=precip_abs
-g.remove rast=prec_sum,prec_max,prec_average
+g.remove -f type=rast pattern=prec_sum,prec_max,prec_average
Modified: grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.to.rast3/t.rast.to.rast3.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -148,7 +148,7 @@
if ret != 0:
grass.fatal(_("Unable to create 3D raster map <%s>" % output))
- grass.run_command("g.remove", rast=null_map)
+ grass.run_command("g.remove", flags='f', type='rast', pattern=null_map)
title = _("Space time voxel cube")
descr = _("This space time voxel cube was created with t.rast.to.rast3")
Modified: grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py
===================================================================
--- grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast.to.rast3/testsuite/test_strds_to_rast3.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -68,7 +68,7 @@
"""Remove generated data"""
#self.runModule("t.remove", flags="rf", type="strds",
# inputs="precip_i,precip_f,precip_d")
- #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
+ #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
self.del_temp_region()
def otest_3m(self):
@@ -257,7 +257,7 @@
def tearDown(self):
"""Remove generated data"""
#self.runModule("t.remove", flags="rf", type="strds", inputs="precip_d")
- #self.runModule('g.mremove', type='rast', pattern='prec_*', flags='f')
+ #self.runModule('g.remove', type='rast', pattern='prec_*', flags='f')
self.del_temp_region()
def otest_years(self):
Modified: grass/trunk/temporal/t.rast3d.list/t.rast3d.list.html
===================================================================
--- grass/trunk/temporal/t.rast3d.list/t.rast3d.list.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rast3d.list/t.rast3d.list.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -7,7 +7,6 @@
<em>
<a href="g.list.html">g.list</a>,
-<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.register/test.t.register.vector.file.layer.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -71,4 +71,4 @@
t.unregister --v type=vect maps=lidar_abs_1:1,lidar_abs_1:2,lidar_abs_1:3,lidar_abs_1:4,lidar_abs_1:5,lidar_abs_1:6
t.remove type=stvds input=lidar_abs_ds1
-g.remove vect=lidar_abs_1,lidar_abs_orig
+g.remove -f type=vect pattern=lidar_abs_1,lidar_abs_orig
Modified: grass/trunk/temporal/t.register/test.t.register.vector.sh
===================================================================
--- grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.register/test.t.register.vector.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -63,6 +63,6 @@
t.unregister --v type=vect maps=lidar_abs_1,lidar_abs_2,lidar_abs_3
t.remove --v type=stvds input=lidar_abs_ds1,lidar_abs_ds2,lidar_abs_ds3,lidar_abs_ds4,lidar_abs_ds5,lidar_abs_ds6,lidar_abs_ds7
t.unregister --v type=vect maps=lidar_abs_4,lidar_abs_5,lidar_abs_6
-g.remove vect=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
+g.remove -f type=vect pattern=lidar_abs_1,lidar_abs_2,lidar_abs_3,lidar_abs_4,lidar_abs_5,lidar_abs_6
Modified: grass/trunk/temporal/t.remove/t.remove.html
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.remove/t.remove.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -25,9 +25,9 @@
description="Monthly sum of precipitation for the \
North Carolina sample data location"
-#Register maps from sample dataset (selecting a subset with g.mlist)
+#Register maps from sample dataset (selecting a subset with g.list)
t.register -i type=rast input=precip_months_sum \
- maps=$(g.mlist type=rast pattern=201*_precip separator=comma) \
+ maps=$(g.list type=rast pattern=201*_precip separator=comma) \
start="2010-01-01" increment="1 months"
#Create some new data by aggregating with 1 years granularity
Modified: grass/trunk/temporal/t.remove/t.remove.py
===================================================================
--- grass/trunk/temporal/t.remove/t.remove.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.remove/t.remove.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -106,8 +106,8 @@
statement = ""
- # Create the pygrass Module object for g.mremove
- remove = pyg.Module("g.mremove", quiet=True, run_=False)
+ # Create the pygrass Module object for g.remove
+ remove = pyg.Module("g.remove", quiet=True, run_=False)
for name in dataset_list:
name = name.strip()
Modified: grass/trunk/temporal/t.rename/test.t.rename.sh
===================================================================
--- grass/trunk/temporal/t.rename/test.t.rename.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.rename/test.t.rename.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -49,4 +49,4 @@
t.remove --v type=strds input=precip_abs3,precip_abs4
t.unregister type=rast maps=prec_1,prec_2
-g.remove rast=prec_1,prec_2
+g.remove -f type=rast pattern=prec_1,prec_2
Modified: grass/trunk/temporal/t.support/test.t.support.sh
===================================================================
--- grass/trunk/temporal/t.support/test.t.support.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.support/test.t.support.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -54,7 +54,7 @@
t.info type=strds input=precip_abs2
# Remove three maps
-g.remove rast=prec_1,prec_2,prec_3
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3
# Booth space time datasets should be updated and 3 maps must have been unregistered
t.support --v -m type=strds input=precip_abs1
@@ -63,4 +63,4 @@
t.remove --v type=strds input=precip_abs1,precip_rel1
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove rast=prec_4,prec_5,prec_6
+g.remove -f type=rast pattern=prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh
===================================================================
--- grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.db.select/test.t.vect.db.select.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -39,6 +39,6 @@
t.remove type=stvds input=prec_observer
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove vect=prec_observer,test_extract
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect pattern=prec_observer,test_extract
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.extract/test.t.vect.extract.layer.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -42,6 +42,6 @@
t.remove type=stvds input=prec_observer,test_extract_1,test_extract_2,test_extract_3
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-g.remove vect=prec_observer
-g.mremove -f type=vect pattern=test_*
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect pattern=prec_observer
+g.remove -f type=vect pattern=test_*
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh
===================================================================
--- grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.extract/test.t.vect.extract.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -44,5 +44,5 @@
# @postprocess
t.unregister type=vect maps=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
t.remove type=stvds input=soil_abs1,soil_abs2,soil_abs3
-g.remove vect=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
-g.remove vect=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
+g.remove -f type=vect pattern=soil_1,soil_2,soil_3,soil_4,soil_5,soil_6,soil_7,soil_8
+g.remove -f type=vect pattern=new_vect_1,new_vect_2,new_vect_3,new_vect_4,new_vect_5,new_vect_6
Modified: grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh
===================================================================
--- grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.import/testsuite/test.t.vect.import.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -59,7 +59,7 @@
# Cleaning up
rm -rf test
-g.remove vect=soil_1,soil_2,soil_3
+g.remove -f type=vect pattern=soil_1,soil_2,soil_3
t.unregister type=vect file="${n1}"
t.remove type=stvds input=soil_abs1,soil_abs2
rm stvds_export_gml.tar.bz2
Modified: grass/trunk/temporal/t.vect.list/t.vect.list.html
===================================================================
--- grass/trunk/temporal/t.vect.list/t.vect.list.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.list/t.vect.list.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -7,7 +7,6 @@
<em>
<a href="g.list.html">g.list</a>,
-<a href="g.mlist.html">g.mlist</a>,
<a href="t.create.html">t.create</a>,
<a href="t.info.html">t.info</a>,
<a href="t.list.html">t.list</a>,
Modified: grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.layer.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -121,4 +121,4 @@
t.unregister type=vect maps=soils:1,soils:2,soils:3,soils:4,soils:5,soils:6
t.remove type=stvds input=soils_abs1,soils_abs2,soils_abs3,soils_abs4,soils_abs5
-g.remove vect=soil_orig,soils
+g.remove -f type=vect pattern=soil_orig,soils
Modified: grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh
===================================================================
--- grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.list/testsuite/test.t.vect.list.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -106,4 +106,4 @@
#t.unregister type=vect maps=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
#t.remove type=stvds input=lidar_abs1,lidar_abs2,lidar_abs3,lidar_abs4,lidar_abs5
-#g.remove vect=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
+#g.remove -f type=vect pattern=lidar_1,lidar_2,lidar_3,lidar_4,lidar_5,lidar_6
Modified: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.layer_bug.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -36,5 +36,5 @@
t.remove type=strds input=precip_abs1
t.remove type=stvds input=prec_observer
-#g.remove vect=prec_observer
-#g.mremove -f type=rast pattern=test_prec_*
+#g.remove -f type=vect pattern=prec_observer
+#g.remove -f type=rast pattern=test_prec_*
Modified: grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh
===================================================================
--- grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.observe.strds/testsuite/test.t.vect.observe.strds.relative.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -31,5 +31,5 @@
t.remove type=stvds input=prec_observer
t.unregister type=vect maps=prec_observer:1,prec_observer:2,prec_observer:3,prec_observer:4,prec_observer:5,prec_observer:6
-#g.remove vect=prec_observer,test_extract
-#g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+#g.remove -f type=vect pattern=prec_observer,test_extract
+#g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
Modified: grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh
===================================================================
--- grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.univar/testsuite/test.t.vect.univar.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -27,5 +27,5 @@
# @postprocess
t.unregister type=vect maps=rpoints1,rpoints2,rvoronoi1,rvoronoi2
t.remove type=stvds input=random_data
-g.remove vect=rpoints1,rpoints2,rvoronoi1,rvoronoi2
+g.remove -f type=vect pattern=rpoints1,rpoints2,rvoronoi1,rvoronoi2
Modified: grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.what.strds/t.vect.what.strds.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -184,8 +184,8 @@
rastermap))
if aggreagated_map_name:
- ret = grass.run_command("g.remove",
- rast=aggreagated_map_name)
+ ret = grass.run_command("g.remove", flags='f', type=rast,
+ pattern=aggreagated_map_name)
if ret != 0:
dbif.close()
grass.fatal(_("Unable to remove raster map <%s>")
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.layer.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -77,5 +77,5 @@
t.unregister type=rast maps=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
t.remove type=strds input=sand_frac_abs_1,sand_frac_abs_2
-g.remove rast=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
-g.remove vect=soils,soil_orig
+g.remove -f type=rast pattern=sand_frac,sand_frac_1,sand_frac_2,sand_frac_3,sand_frac_4,sand_frac_5,sand_frac_6
+g.remove -f type=vect pattern=soils,soil_orig
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -54,5 +54,5 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_abs1
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove vect=soil_1,soil_2,soil_3
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect pattern=soil_1,soil_2,soil_3
Modified: grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh
===================================================================
--- grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/temporal/t.vect.what.strds/test.t.vect.what.strds_relative.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -55,5 +55,5 @@
t.unregister type=rast maps=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
t.remove type=strds input=precip_rel1
-g.remove rast=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
-g.remove vect=soil_1,soil_2,soil_3
+g.remove -f type=rast pattern=prec_1,prec_2,prec_3,prec_4,prec_5,prec_6
+g.remove -f type=vect pattern=soil_1,soil_2,soil_3
Modified: grass/trunk/testsuite/raster/raster_md5test.sh
===================================================================
--- grass/trunk/testsuite/raster/raster_md5test.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/testsuite/raster/raster_md5test.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -48,7 +48,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove rast=$TMPNAME > /dev/null
+ g.remove -f type=rast pattern=$TMPNAME > /dev/null
}
# check if a MASK is already present:
@@ -64,11 +64,11 @@
{
echo "Restoring user region"
g.region region=$TMPNAME
- g.remove region=$TMPNAME > /dev/null
+ g.remove -f type=region pattern=$TMPNAME > /dev/null
#restore user mask if present:
if test -f $LOCATION/cell/$USERMASK ; then
echo "Restoring user MASK"
- g.remove rast=MASK > /dev/null
+ g.remove -f type=rast pattern=MASK > /dev/null
g.rename $USERMASK,MASK > /dev/null
fi
}
Modified: grass/trunk/testsuite/raster/rhemisphere.sh
===================================================================
--- grass/trunk/testsuite/raster/rhemisphere.sh 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/testsuite/raster/rhemisphere.sh 2014-09-17 16:24:34 UTC (rev 62015)
@@ -24,7 +24,7 @@
cleanup()
{
echo "Removing temporary map"
- g.remove --q rast=$TMP > /dev/null
+ g.remove --q -f type=rast pattern=$TMP > /dev/null
}
########################
Modified: grass/trunk/tools/thumbnails.py
===================================================================
--- grass/trunk/tools/thumbnails.py 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/tools/thumbnails.py 2014-09-17 16:24:34 UTC (rev 62015)
@@ -30,9 +30,11 @@
if tmp_img:
grass.try_remove(tmp_img)
if tmp_grad_rel:
- grass.run_command('g.remove', rast = tmp_grad_rel, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast',
+ pattern = tmp_grad_rel, quiet = True)
if tmp_grad_abs:
- grass.run_command('g.remove', rast = tmp_grad_abs, quiet = True)
+ grass.run_command('g.remove', flags = 'f', type = 'rast',
+ pattern = tmp_grad_abs, quiet = True)
# def rotate(src, dst):
# grass.call(["convert", "-rotate", "90", src, dst])
Modified: grass/trunk/vector/v.distance/v.distance.html
===================================================================
--- grass/trunk/vector/v.distance/v.distance.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/vector/v.distance/v.distance.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -149,7 +149,7 @@
# we need to give the lines category numbers, create a table, and create
# a column in that table to hold the distance data.
v.category vdistance_vectors_raw out=vdistance_vectors type=line op=add
-g.remove v=vdistance_vectors_raw
+g.remove -f type=vect pattern=vdistance_vectors_raw
v.db.addtable map=vdistance_vectors column="length DOUBLE"
v.to.db map=vdistance_vectors option=length column=length
Modified: grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html
===================================================================
--- grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-09-17 14:07:36 UTC (rev 62014)
+++ grass/trunk/vector/v.lrs/v.lrs.create/v.lrs.create.html 2014-09-17 16:24:34 UTC (rev 62015)
@@ -43,7 +43,7 @@
# vector line needs to be polyline
v.build.polylines busroute_tmp2 out=busroute_tmp3
v.category busroute_tmp3 out=busroute op=add
-g.remove vect=busroute_tmp,busroute_tmp2,busroute_tmp3
+g.remove -f type=vect pattern=busroute_tmp,busroute_tmp2,busroute_tmp3
</pre></div>
The result can be visualized:
More information about the grass-commit
mailing list