[GRASS-SVN] r33578 - in grass/trunk/scripts: db.in.ogr db.out.ogr v.report

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-09-27 20:02:45 -0400 (Sat, 27 Sep 2008)
New Revision: 33578

Modified:
   grass/trunk/scripts/db.in.ogr/db.in.ogr.py
   grass/trunk/scripts/db.out.ogr/db.out.ogr.py
   grass/trunk/scripts/v.report/v.report.py
Log:
Use 'option = None' for unspecified options, rather than **dict


Modified: grass/trunk/scripts/db.in.ogr/db.in.ogr.py
===================================================================
--- grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2008-09-28 00:01:47 UTC (rev 33577)
+++ grass/trunk/scripts/db.in.ogr/db.in.ogr.py	2008-09-28 00:02:45 UTC (rev 33578)
@@ -80,12 +80,13 @@
 	grass.write_command('db.execute', stdin = "DROP TABLE %s" % output)
 
     # treat DB as real vector map...
-    layer_opt = {}
     if db_table:
-	layer_opt['layer'] = db_table
+	layer = db_table
+    else:
+	layer = None
 
     if grass.run_command('v.in.ogr', flags = 'o', dsn = dsn, output = output,
-			 quiet = True, **layer_opt) != 0:
+			 layer = layer, quiet = True) != 0:
 	if db_table:
 	    grass.fatal("Input table <%s> not found or not readable" % input)
 	else:

Modified: grass/trunk/scripts/db.out.ogr/db.out.ogr.py
===================================================================
--- grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2008-09-28 00:01:47 UTC (rev 33577)
+++ grass/trunk/scripts/db.out.ogr/db.out.ogr.py	2008-09-28 00:02:45 UTC (rev 33578)
@@ -66,9 +66,10 @@
     if format.lower() == 'dbf':
 	format = "ESRI_Shapefile"
 
-    olayer = {}
     if format.lower() == 'csv':
-	olayer['olayer'] = grass.basename(dsn, 'csv')
+	olayer = grass.basename(dsn, 'csv')
+    else:
+	olayer = None
 
     #is there a simpler way of testing for --overwrite?
     dbffile = input + '.dbf'
@@ -76,7 +77,7 @@
 	grass.fatal("File <%s> already exists" % dbffile)
 
     if grass.run_command('v.out.ogr', quiet = True, input = input, dsn = dsn,
-			 format = format, type = 'point', **olayer) != 0:
+			 format = format, type = 'point', olayer = olayer) != 0:
 	sys.exit(1)
 
     if format == "ESRI_Shapefile":

Modified: grass/trunk/scripts/v.report/v.report.py
===================================================================
--- grass/trunk/scripts/v.report/v.report.py	2008-09-28 00:01:47 UTC (rev 33577)
+++ grass/trunk/scripts/v.report/v.report.py	2008-09-28 00:02:45 UTC (rev 33578)
@@ -112,11 +112,11 @@
 	extracolnames = [option]
 
     if units in ['p','percent']:
-	unitsp = {'units': 'meters'}
+	unitsp = 'meters'
     elif units:
-	unitsp = {'units': 'meters'}
+	unitsp = units
     else:
-	unitsp = {}
+	unitsp = None
 
     # NOTE: we suppress -1 cat and 0 cat
 
@@ -140,7 +140,7 @@
 	#fetch the requested attribute sorted by cat:
 	p = grass.pipe_command('v.to.db', flags = 'p',
 			       map = mapname, option = option, columns = columns,
-			       layer = layer, **unitsp)
+			       layer = layer, units = unitsp)
 	records2 = []
 	for line in p.stdout:
 	    fields = line.rstrip('\r\n').split('|')
@@ -166,7 +166,7 @@
         #make pre-table
 	p = grass.pipe_command('v.to.db', flags = 'p',
 			       map = mapname, option = option, columns = columns,
-			       layer = layer, **unitsp)
+			       layer = layer, units = unitsp)
 	records3 = []
 	for line in p.stdout:
 	    fields = line.split('|')