v.db.addtable: major update, define option for key column

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47480 15284696-431f-4ddb-bdfa-cd5b030d7da7

scripts/v.db.addtable/v.db.addtable.py

@@ -5,8 +5,9 @@
 # MODULE:       v.db.addtable
 # AUTHOR(S):   	Markus Neteler 
 #               Converted to Python by Glynn Clements
+#               Key column added by Martin Landa <landa.martin gmail.com>
 # PURPOSE:      interface to db.execute to creates and add a new table to given vector map
-# COPYRIGHT:    (C) 2005, 2007, 2008  by Markus Neteler & the GRASS Development Team
+# COPYRIGHT:    (C) 2005, 2007, 2008, 2011  by Markus Neteler & the GRASS Development Team
 #
 #               This program is free software under the GNU General Public
 #               License (>=v2). Read the file COPYING that comes with GRASS
@@ -26,7 +27,8 @@
 #% key: table
 #% type: string
 #% description: Name of new attribute table (default: vector map name)
-#% required : no
+#% required: no
+#% guisection: Definition
 #%end
 #%option 
 #% key: layer
@@ -34,15 +36,20 @@
 #% description: Layer number where to add new attribute table
 #% answer: 1
 #% required: no
+#% guisection: Definition
+#%end
+#%option G_OPT_DB_KEYCOLUMN
+#% guisection: Definition
 #%end
 #%option
 #% key: columns
 #% type: string
-#% description: Name and type of the new column(s) (types depend on database backend, but all support VARCHAR(), INT, DOUBLE PRECISION and DATE)
-#% answer: cat integer
+#% label: Name and type of the new column(s)
+#% description: Types depend on database backend, but all support VARCHAR(), INT, DOUBLE PRECISION and DATE. Example: "label varchar(250), type integer"
 #% required: no
 #% multiple: yes
 #% key_desc: name type
+#% guisection: Definition
 #%end
 
 import sys
@@ -50,95 +57,86 @@ import os
 import grass.script as grass
 
 def main():
-    map = options['map']
+    vector = options['map']
     table = options['table']
     layer = options['layer']
     columns = options['columns']
-
-    mapset = grass.gisenv()['MAPSET']
-
+    key = options['key']
+    
     # does map exist in CURRENT mapset?
-    if not grass.find_file(map, element = 'vector', mapset = mapset)['file']:
-	grass.fatal(_("Vector map <%s> not found in current mapset") % map)
-
-    map_name = map.split('@')[0]
-
+    mapset = grass.gisenv()['MAPSET']
+    if not grass.find_file(vector, element = 'vector', mapset = mapset)['file']:
+	grass.fatal(_("Vector map <%s> not found in current mapset") % vector)
+    
+    map_name = vector.split('@')[0]
+    
     if not table:
 	if layer == '1':
-	    grass.message(_("Using vector map name as table name: ") + map_name)
+	    grass.verbose(_("Using vector map name as table name: <%s>") % map_name)
 	    table = map_name
 	else:
 	    # to avoid tables with identical names on higher layers
-	    grass.message(_("Using vector map name extended by layer number as table name: %s_%s") % (map_name, layer))
-	    table = "%s_%s" % (map_name, layer)
+            table = "%s_%s" % (map_name, layer)
+	    grass.verbose(_("Using vector map name extended by layer number as table name: <%s>") % table)
     else:
-	grass.message(_("Using user specified table name: ") + table)
-
+	grass.verbose(_("Using user specified table name: %s") % table)
+    
     # check if DB parameters are set, and if not set them.
     grass.run_command('db.connect', flags = 'c')
-
-    grass.message(_("Creating new DB connection based on default mapset settings..."))
+    grass.verbose(_("Creating new DB connection based on default mapset settings..."))
     kv = grass.db_connection()
     database = kv['database']
     driver = kv['driver']
-
+    
     # maybe there is already a table linked to the selected layer?
     nuldev = file(os.devnull, 'w')
     try:
-        grass.vector_db(map, stderr = nuldev)[int(layer)]
+        grass.vector_db(map_name, stderr = nuldev)[int(layer)]
 	grass.fatal(_("There is already a table linked to layer <%s>") % layer)
     except KeyError:
         pass
     
     # maybe there is already a table with that name?
-    found = False
-    p = grass.pipe_command('db.tables', database = database, driver = driver, stderr = nuldev)
-    for line in p.stdout:
-	if line.rstrip('\r\n') == table:
-	    found = True
-	    break
-    p.wait()
-
-    if not found:
-	column_def = [col.strip().lower() for col in columns.split(',')]
-
-	#if not existing, create it:
-	if "cat integer" not in column_def:
-	    column_def.append("cat integer")
-	column_def = ','.join(column_def)
-
-	grass.message(_("Creating table with columns (%s)") % column_def)
-
-	# take care if the DBF directory is missing (heck, the DBF driver should take care!)
-	if driver == "dbf":
-	    env = grass.gisenv()
-	    path = os.path.join(env['GISDBASE'], env['LOCATION_NAME'], env['MAPSET'], "dbf")
-	    if not os.path.isdir(path):
-		grass.message(_("Creating missing DBF directory in mapset <%s>") % env['MAPSET'])
-		os.mkdir(path)
-		grass.run_command('db.connect', driver = dbf, database = '$GISDBASE/$LOCATION_NAME/$MAPSET/dbf/')
-
-    sql = "CREATE TABLE %s (%s)" % (table, column_def)
-
-    if grass.write_command('db.execute', input = '-', database = database, driver = driver, stdin = sql) != 0:
-	grass.fatal(_("Cannot continue."))
-
+    tables = grass.read_command('db.tables', flags = 'p', database = database, driver = driver,
+                                stderr = nuldev)
+    
+    if not table in tables.splitlines():
+        if columns:
+            column_def = map(lambda x: x.strip().lower(), columns.strip().split(','))
+        else:
+            column_def = []
+        
+	# if not existing, create it:
+        column_def_key = "%s integer" % key
+	if column_def_key not in column_def:
+	    column_def.insert(0, column_def_key)
+        column_def = ','.join(column_def)
+        
+	grass.verbose(_("Creating table with columns (%s)...") % column_def)
+        
+        sql = "CREATE TABLE %s (%s)" % (table, column_def)
+        if grass.write_command('db.execute', input = '-', database = database, driver = driver, stdin = sql) != 0:
+            grass.fatal(_("Unable to create table <%s>") % table)
+    
     # connect the map to the DB:
-    grass.run_command('v.db.connect', map = map, database = database, driver = driver,
-		      layer = layer, table = table, key = 'cat')
-
+    grass.run_command('v.db.connect', quiet = True,
+                      map = map_name, database = database, driver = driver,
+		      layer = layer, table = table, key = key)
+    
     # finally we have to add cats into the attribute DB to make modules such as v.what.rast happy:
     # (creates new row for each vector line):
-    grass.run_command('v.to.db', map = map, layer = layer,
-                      option = 'cat', column = 'cat', qlayer = layer)
-
-    if grass.verbosity() > 0:
-	grass.message(_("Current attribute table links:"))
-	grass.run_command('v.db.connect', flags = 'p', map = map)
-
+    grass.run_command('v.to.db', map = map_name, layer = layer,
+                      option = 'cat', column = key, qlayer = layer)
+    
+    grass.verbose(_("Current attribute table links:"))
+    if grass.verbosity() > 2:
+	grass.run_command('v.db.connect', flags = 'p', map = map_name)
+    
     # write cmd history:
-    grass.vector_history(map)
+    grass.vector_history(map_name)
+    
+    return 0
 
 if __name__ == "__main__":
     options, flags = grass.parser()
-    main()
+    sys.exit(main())