[GRASS-SVN] r63368 - in grass-addons/grass7: raster/r.basin raster/r.mwprecip raster/r.univar2 vector/v.build.pg vector/v.external.all vector/v.fixed.segmentpoints vector/v.in.wfs2 vector/v.link.precip
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Dec 4 13:52:06 PST 2014
Author: neteler
Date: 2014-12-04 13:52:06 -0800 (Thu, 04 Dec 2014)
New Revision: 63368
Modified:
grass-addons/grass7/raster/r.basin/r.basin.py
grass-addons/grass7/raster/r.mwprecip/r.mwprecip.py
grass-addons/grass7/raster/r.univar2/r.univar2.html
grass-addons/grass7/vector/v.build.pg/v.build.pg.html
grass-addons/grass7/vector/v.external.all/v.external.all.html
grass-addons/grass7/vector/v.external.all/v.external.all.py
grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py
grass-addons/grass7/vector/v.in.wfs2/wfs_base.py
grass-addons/grass7/vector/v.link.precip/v.link.precip.py
Log:
v.in.ogr, v.external: renamed dsn to input, see http://trac.osgeo.org/grass/browser/grass/trunk/lib/gis/renamed_options
Modified: grass-addons/grass7/raster/r.basin/r.basin.py
===================================================================
--- grass-addons/grass7/raster/r.basin/r.basin.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/raster/r.basin/r.basin.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -773,7 +773,7 @@
# Import table "summary", attaches it to "outlet_snap", then drops it
- grass.run_command("db.in.ogr", dsn = csvfileT,
+ grass.run_command("db.in.ogr", input = csvfileT,
output = "summary")
Modified: grass-addons/grass7/raster/r.mwprecip/r.mwprecip.py
===================================================================
--- grass-addons/grass7/raster/r.mwprecip/r.mwprecip.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/raster/r.mwprecip/r.mwprecip.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -1076,7 +1076,7 @@
grass.run_command('v.in.ogr',
- dsn="PG:",
+ input = "PG:",
layer = points_schema,
output = points_ogr,
overwrite=True,
@@ -1116,7 +1116,7 @@
if not flags['q']:
grass.run_command('v.in.ogr',
- dsn="PG:",
+ input = "PG:",
layer = "link",
output = "link",
flags='t',
Modified: grass-addons/grass7/raster/r.univar2/r.univar2.html
===================================================================
--- grass-addons/grass7/raster/r.univar2/r.univar2.html 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/raster/r.univar2/r.univar2.html 2014-12-04 21:52:06 UTC (rev 63368)
@@ -78,7 +78,7 @@
echo '"Integer","String","Real","Real","Real"' > fields_stats.csvt
# import table
-db.in.ogr dsn=fields_stats.csv output=fields_data
+db.in.ogr input=fields_stats.csv output=fields_data
# view table
db.select fields_data
Modified: grass-addons/grass7/vector/v.build.pg/v.build.pg.html
===================================================================
--- grass-addons/grass7/vector/v.build.pg/v.build.pg.html 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.build.pg/v.build.pg.html 2014-12-04 21:52:06 UTC (rev 63368)
@@ -31,13 +31,13 @@
Export vector map into PostGIS:
<div class="code"><pre>
-v.out.ogr dsn=PG:dbname=pgis_nc input=bridges format=PostgreSQL
+v.out.ogr input=bridges output=PG:dbname=pgis_nc format=PostgreSQL
</pre></div>
Create a new vector map as a link to PostGIS table:
<div class="code"><pre>
-v.external dsn=PG:dbname=pgis_nc layer=bridges
+v.external input=PG:dbname=pgis_nc layer=bridges
</pre></div>
Check metadata:
Modified: grass-addons/grass7/vector/v.external.all/v.external.all.html
===================================================================
--- grass-addons/grass7/vector/v.external.all/v.external.all.html 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.external.all/v.external.all.html 2014-12-04 21:52:06 UTC (rev 63368)
@@ -3,7 +3,7 @@
<em>v.external.all</em> creates
(using <em><a href="v.external.html">v.external</a></em>) in the
current mapset new pseudo-vector maps for all OGR layers from given
-OGR datasource (<b>dsn</b> option).
+OGR datasource (<b>input</b> option).
<h2>EXAMPLES</h2>
@@ -12,7 +12,7 @@
List available feature tables in given PostGIS database
<div class="code"><pre>
-v.external.all -l dsn=PG:dbname=pgis_nc
+v.external.all -l input=PG:dbname=pgis_nc
PostGIS database contains 55 feature table(s):
boundary_county
@@ -33,13 +33,13 @@
PostGIS feature tables
<div class="code"><pre>
-v.external.all dsn=PG:dbname=pgis_nc
+v.external.all input=PG:dbname=pgis_nc
</pre></div>
<h3>Esri Shapefile</h3>
<div class="code"><pre>
-v.external.all -l dsn=~/geodata/ncshape/
+v.external.all -l input=~/geodata/ncshape/
Data source (format 'ESRI Shapefile')
contains 44 layers:
poi_names_wake
@@ -54,7 +54,7 @@
</pre></div>
<div class="code"><pre>
-v.external.all -l dsn=~/geodata/ncshape/
+v.external.all -l input=~/geodata/ncshape/
</pre></div>
<h2>AUTHOR</h2>
Modified: grass-addons/grass7/vector/v.external.all/v.external.all.py
===================================================================
--- grass-addons/grass7/vector/v.external.all/v.external.all.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.external.all/v.external.all.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -23,7 +23,7 @@
#% description: List available layers in data source and exit
#%end
#%option
-#% key: dsn
+#% key: input
#% type: string
#% description: Name of input OGR or PostGIS data source
#% required: yes
@@ -39,7 +39,7 @@
def list_layers(dsn):
ret = grass.read_command('v.external',
flags = 'l',
- dsn = dsn)
+ input = dsn)
if not ret:
sys.exit(1)
@@ -54,17 +54,17 @@
('-' * 80, layer, oname, '-' * 80))
try:
grass.run_command('v.external',
- dsn = dsn, layer = layer, output = oname)
+ input = dsn, layer = layer, output = oname)
except CalledModuleError:
grass.warning(_("Unable to create link for OGR layer <%s>") % layer)
def main():
if flags['l']:
- ret = list_layers(options['dsn'])
+ ret = list_layers(options['input'])
sys.stdout.write(os.linesep.join(ret))
sys.stdout.write(os.linesep)
else:
- make_links(options['dsn'])
+ make_links(options['input'])
return 0
Modified: grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py
===================================================================
--- grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.fixed.segmentpoints/v.fixed.segmentpoints.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -183,7 +183,7 @@
new_line = line.replace(" ", ";")
f.write(new_line)
- grass.run_command("db.in.ogr", output = 't_segmentpoints_csv', dsn = "%s" % segment_points_file_csv)
+ grass.run_command("db.in.ogr", output = 't_segmentpoints_csv', input = "%s" % segment_points_file_csv)
grass.run_command("v.db.join", map = voutpoint,
column = 'cat',
@@ -219,7 +219,7 @@
csv_to_export = os.path.join( directory, fpointscsv_export )
grass.run_command("db.out.ogr", input = voutpoint,
- dsn = '%s' % (csv_to_export),
+ output = '%s' % (csv_to_export),
format = 'CSV')
grass.message( "Export done." )
Modified: grass-addons/grass7/vector/v.in.wfs2/wfs_base.py
===================================================================
--- grass-addons/grass7/vector/v.in.wfs2/wfs_base.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.in.wfs2/wfs_base.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -237,7 +237,7 @@
grass.run_command('v.in.ogr',
quiet = True,
overwrite = True,
- dsn = temp_warpmap,
+ input = temp_warpmap,
output = self.o_output)
except CalledModuleError:
grass.fatal(_('%s failed') % 'v.in.ogr')
Modified: grass-addons/grass7/vector/v.link.precip/v.link.precip.py
===================================================================
--- grass-addons/grass7/vector/v.link.precip/v.link.precip.py 2014-12-04 08:20:04 UTC (rev 63367)
+++ grass-addons/grass7/vector/v.link.precip/v.link.precip.py 2014-12-04 21:52:06 UTC (rev 63368)
@@ -123,7 +123,7 @@
print_message('v.in.ogr')
grass.run_command('v.in.ogr',
- dsn="PG:",
+ input = "PG:",
layer = layer,
output = ogr,
overwrite=True,
@@ -194,7 +194,7 @@
grass.run_command('v.in.ogr',
- dsn="PG:",
+ input = "PG:",
layer = layer,
output = ogr,
overwrite=True,
More information about the grass-commit
mailing list