浏览代码

v.db.dropcol renamed to v.db.dropcolumn (part 1)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38094 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 年之前
父节点
当前提交
bcbd9cd78d

+ 1 - 1
gui/wxpython/docs/wxGUI.Attribute_Table_Manager.html

@@ -30,7 +30,7 @@
 <em>
   <a href="v.db.addcol.html">v.db.addcol</a>,
   <a href="v.db.connect.html">v.db.connect</a>,
-  <a href="v.db.dropcol.html">v.db.dropcol</a>,
+  <a href="v.db.dropcolumn.html">v.db.dropcolumn</a>,
   <a href="v.db.renamecol.html">v.db.renamecol</a>,
   <a href="v.what.html">v.what</a>
 </em>

+ 2 - 2
gui/wxpython/gui_modules/dbm.py

@@ -1545,7 +1545,7 @@ class AttributeManager(wx.Frame):
 
         item = list.GetFirstSelected()
         while item != -1:
-            self.listOfCommands.append(('v.db.dropcol',
+            self.listOfCommands.append(('v.db.dropcolumn',
                                         { 'map' : self.vectorName,
                                           'layer' : self.layer,
                                           'column' : list.GetItemText(item) }
@@ -1568,7 +1568,7 @@ class AttributeManager(wx.Frame):
         table = self.mapDBInfo.layers[self.layer]['table']
         cols = self.mapDBInfo.GetColumns(table)
         for col in cols:
-            self.listOfCommands.append(('v.db.dropcol',
+            self.listOfCommands.append(('v.db.dropcolumn',
                                         { 'map' : self.vectorName,
                                           'layer' : self.layer,
                                           'column' : col }

+ 2 - 2
raster/r.watershed/front/r.watershed.html

@@ -398,7 +398,7 @@ as the cut-off value. This only works with SFD, not with MFD.
   r.thin in=rwater.course out=rwater.course.Thin
   r.colors -gn rwater.course.Thin color=grey
   r.to.vect in=rwater.course.Thin out=rwater_course feature=line
-  v.db.dropcol map=rwater_course column=label
+  v.db.dropcolumn map=rwater_course column=label
 </pre></div>
 <!-- can't set line attribute to catchment it is in as v.what.rast and 
   v.distance only work for point features. Could create endpoint node
@@ -412,7 +412,7 @@ Create watershed basins map and convert to a vector polygon map
 <div class="code"><pre>
   r.watershed elev=elevation.dem basin=rwater.basin thresh=15000
   r.to.vect -s in=rwater.basin out=rwater_basins feature=area
-  v.db.dropcol map=rwater_basins column=label
+  v.db.dropcolumn map=rwater_basins column=label
   v.db.renamecol map=rwater_basins column=value,catchment
 </pre></div>
 <br>

+ 1 - 1
scripts/Makefile

@@ -42,7 +42,7 @@ SUBDIRS = \
 	v.db.addcol \
 	v.db.addtable \
 	v.db.join \
-	v.db.dropcol \
+	v.db.dropcolumn \
 	v.db.droptable \
 	v.db.renamecol \
 	v.db.reconnect.all \

+ 1 - 1
scripts/db.dropcolumn/db.dropcolumn.html

@@ -32,7 +32,7 @@ db.describe -c myroads
 
 <em><a HREF="db.droptable.html">db.droptable</a></em>,
 <em><a HREF="db.execute.html">db.execute</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>
+<em><a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a></em>
 
 
 <h2>AUTHOR</h2>

+ 1 - 1
scripts/v.colors/v.colors.py

@@ -304,7 +304,7 @@ def main():
     else:
 	grass.run_command('g.remove', rast = tmp_colr)
 
-    #v.db.dropcol map=vcol_test col=GRASSRGB
+    #v.db.dropcolumn map=vcol_test col=GRASSRGB
     #d.vect -a vcol_test icon=basic/circle color=none size=8
 
 if __name__ == "__main__":

+ 1 - 1
scripts/v.db.addcol/v.db.addcol.html

@@ -34,7 +34,7 @@ v.info -c sentiero_brenta_points
 <em><a HREF="db.execute.html">db.execute</a></em>,
 <em><a HREF="v.db.addtable.html">v.db.addtable</a></em>,
 <em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
+<em><a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a></em>,
 <em><a HREF="v.db.droptable.html">v.db.droptable</a></em>,
 <em><a HREF="v.db.select.html">v.db.select</a></em>,
 <em><a HREF="v.db.update.html">v.db.update</a></em>

+ 1 - 1
scripts/v.db.addtable/v.db.addtable.html

@@ -48,7 +48,7 @@ v.info -c sentiero_brenta_points
 <em><a HREF="v.category.html">v.category</a></em>,
 <em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
 <em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
+<em><a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a></em>,
 <em><a HREF="v.db.droptable.html">v.db.droptable</a></em>,
 <em><a HREF="v.db.select.html">v.db.select</a></em>,
 <em><a HREF="v.db.update.html">v.db.update</a></em><br>

+ 1 - 1
scripts/v.db.dropcol/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-PGM = v.db.dropcol
+PGM = v.db.dropcolumn
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 

+ 4 - 4
scripts/v.db.dropcol/v.db.dropcol.html

@@ -1,13 +1,13 @@
 <h2>DESCRIPTION</h2>
 
-<em>v.db.dropcol</em> drops a column from the attribute table connected
+<em>v.db.dropcolumn</em> drops a column from the attribute table connected
 to a given vector map. It automatically checks the connection for the specified
-layer. <em>v.db.dropcol</em> omits to delete the 'cat' column which is
+layer. <em>v.db.dropcolumn</em> omits to delete the 'cat' column which is
 relevant to keep the connection between vector map and table.
 
 <h2>NOTES</h2>
 
-v.db.dropcol is a front-end to <em>db.execute</em> to allow easier usage.
+v.db.dropcolumn is a front-end to <em>db.execute</em> to allow easier usage.
 
 The existing database connection(s) can be verified with <em>v.db.connect</em>.
 
@@ -15,7 +15,7 @@ The existing database connection(s) can be verified with <em>v.db.connect</em>.
 
 Dropping a column:<br>
 <div class="code"><pre>
-v.db.dropcol sentiero_brenta_points column=slope
+v.db.dropcolumn sentiero_brenta_points column=slope
 v.info -c sentiero_brenta_points
 </pre></div>
 

scripts/v.db.dropcol/v.db.dropcol.py → scripts/v.db.dropcol/v.db.dropcolumn.py


+ 1 - 1
scripts/v.db.droptable/v.db.droptable.html

@@ -25,7 +25,7 @@ v.db.connect -p sentiero_brenta_points
 <em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
 <em><a HREF="v.db.addtable.html">v.db.addtable</a></em>,
 <em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
+<em><a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a></em>,
 <em><a HREF="v.db.select.html">v.db.select</a></em>,
 <em><a HREF="v.db.update.html">v.db.update</a></em>
 

+ 1 - 1
scripts/v.db.renamecol/v.db.renamecol.html

@@ -37,7 +37,7 @@ v.info -c myroads
 <em><a HREF="v.db.addcol.html">v.db.addcol</a></em>,
 <em><a HREF="v.db.addtable.html">v.db.addtable</a></em>,
 <em><a HREF="v.db.connect.html">v.db.connect</a></em>,
-<em><a HREF="v.db.dropcol.html">v.db.dropcol</a></em>,
+<em><a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a></em>,
 <em><a HREF="v.db.droptable.html">v.db.droptable</a></em>,
 <em><a HREF="v.db.select.html">v.db.select</a></em>,
 <em><a HREF="v.db.update.html">v.db.update</a></em>

+ 2 - 2
scripts/v.db.renamecol/v.db.renamecol.py

@@ -7,7 +7,7 @@
 #               Converted to Python by Glynn Clements
 # PURPOSE:      interface to db.execute to drop a column from the 
 #               attribute table connected to a given vector map
-#               - Based on v.db.dropcol
+#               - Based on v.db.dropcolumn
 #               - with special trick for SQLite and DBF (here the new col is 
 #                 added/values copied/old col deleted)
 # COPYRIGHT:    (C) 2007 by the GRASS Development Team
@@ -105,7 +105,7 @@ def main():
 	grass.run_command('v.db.addcol', map = map, layer = layer, column = colspec)
 	sql = "UPDATE %s SET %s=%s" % (table, newcol, oldcol)
 	grass.write_command('db.execute', database = database, driver = driver, stdin = sql)
-	grass.run_command('v.db.dropcol', map = map, layer = layer, column = oldcol)
+	grass.run_command('v.db.dropcolumn', map = map, layer = layer, column = oldcol)
     else:
 	sql = "ALTER TABLE %s RENAME %s TO %s" % (table, oldcol, newcol)
 	grass.write_command('db.execute', database = database, driver = driver, stdin = sql)

+ 1 - 1
vector/v.db.connect/v.db.connect.html

@@ -196,7 +196,7 @@ v.db.connect map=mytable driver=pg database="host=localhost,dbname=meteo" \
 <a HREF="v.db.addtable.html">v.db.addtable</a>,
 <a HREF="v.db.droptable.html">v.db.droptable</a>,
 <a HREF="v.db.addcol.html">v.db.addcol</a>,
-<a HREF="v.db.dropcol.html">v.db.dropcol</a>,
+<a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a>,
 <a HREF="v.external.html">v.external</a>,
 <a HREF="v.in.db.html">v.in.db</a>,
 <a HREF="v.overlay.html">v.overlay</a>

+ 1 - 1
vector/v.transform/v.transform.html

@@ -99,7 +99,7 @@ v.db.select myarchsites
 # perform transformation to 3D
 v.transform -t myarchsites output=myarchsites3d column="zshift:zs" table=myarchsites
 # drop table containing transformation parameters
-v.db.dropcol myarchsites3d col=zs
+v.db.dropcolumn myarchsites3d col=zs
 </pre></div>
 The resulting map is a 3D vector map.
 

+ 3 - 3
vector/v.vol.rst/v.vol.rst.html

@@ -86,9 +86,9 @@ v.info -c elevrand_3d
 v.info -t elevrand_3d
 
 # remove the now superfluous 'x', 'y' and 'value' (z) columns
-v.db.dropcol elevrand_3d col=x
-v.db.dropcol elevrand_3d col=y
-v.db.dropcol elevrand_3d col=value
+v.db.dropcolumn elevrand_3d col=x
+v.db.dropcolumn elevrand_3d col=y
+v.db.dropcolumn elevrand_3d col=value
 
 # add attribute to interpolate
 # (Soil range types taken from the USDA Soil Survey)

+ 1 - 1
vector/vectorintro.html

@@ -198,7 +198,7 @@ the table must be populated with one row per category (using <a href="v.to.db.ht
 However, this can be performed in a single step using <a href="v.db.addtable.html">v.db.addtable</a>
 along with the definition of table column types. Column adding and dropping
 can be done with <a HREF="v.db.addcol.html">v.db.addcol</a> and
-<a HREF="v.db.dropcol.html">v.db.dropcol</a>. A table column can be renamed with
+<a HREF="v.db.dropcolumn.html">v.db.dropcolumn</a>. A table column can be renamed with
 <a HREF="v.db.renamecol.html">v.db.renamecol</a>. To drop a table from a map, use
 <a HREF="v.db.droptable.html">v.db.droptable</a>. Values in a table can be updated
 with <a HREF="v.db.update.html">v.db.update</a>. Tables can be joined with with