[GRASS-SVN] r33006 - in grass/trunk: db/base db/db.login
display/d.thematic.area display/d.vect include lib/gis
swig/perl swig/python/interfaces vector/v.class
vector/v.db.connect vector/v.db.select vector/v.distance
vector/v.edit vector/v.extract vector/v.extrude
vector/v.generalize vector/v.in.db vector/v.in.ogr
vector/v.label vector/v.random vector/v.reclass
vector/v.surf.rst vector/v.to.db vector/v.to.rast
vector/v.transform vector/v.univar vector/v.vol.rst
vector/v.what.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 22 11:58:29 EDT 2008
Author: martinl
Date: 2008-08-22 11:58:28 -0400 (Fri, 22 Aug 2008)
New Revision: 33006
Modified:
grass/trunk/db/base/columns.c
grass/trunk/db/base/connect.c
grass/trunk/db/base/copy.c
grass/trunk/db/base/createdb.c
grass/trunk/db/base/databases.c
grass/trunk/db/base/describe.c
grass/trunk/db/base/dropdb.c
grass/trunk/db/base/droptable.c
grass/trunk/db/base/execute.c
grass/trunk/db/base/select.c
grass/trunk/db/base/tables.c
grass/trunk/db/db.login/main.c
grass/trunk/display/d.thematic.area/main.c
grass/trunk/display/d.vect/main.c
grass/trunk/include/gis.h
grass/trunk/lib/gis/parser.c
grass/trunk/swig/perl/gis.h
grass/trunk/swig/python/interfaces/gis.i
grass/trunk/vector/v.class/main.c
grass/trunk/vector/v.db.connect/main.c
grass/trunk/vector/v.db.select/main.c
grass/trunk/vector/v.distance/main.c
grass/trunk/vector/v.edit/args.c
grass/trunk/vector/v.extract/main.c
grass/trunk/vector/v.extrude/main.c
grass/trunk/vector/v.generalize/main.c
grass/trunk/vector/v.in.db/main.c
grass/trunk/vector/v.in.ogr/main.c
grass/trunk/vector/v.label/main.c
grass/trunk/vector/v.random/main.c
grass/trunk/vector/v.reclass/main.c
grass/trunk/vector/v.surf.rst/main.c
grass/trunk/vector/v.to.db/parse.c
grass/trunk/vector/v.to.rast/main.c
grass/trunk/vector/v.transform/main.c
grass/trunk/vector/v.univar/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.what.rast/main.c
Log:
Change db-related standard options to G_OPT_DB_*
Modified: grass/trunk/db/base/columns.c
===================================================================
--- grass/trunk/db/base/columns.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/columns.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -75,15 +75,15 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- table = G_define_standard_option(G_OPT_TABLE);
+ table = G_define_standard_option(G_OPT_DB_TABLE);
table->required = YES;
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
if ((drv = db_get_default_driver_name()))
driver->answer = (char *) drv;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = db_get_default_database_name()))
database->answer = (char *) db;
Modified: grass/trunk/db/base/connect.c
===================================================================
--- grass/trunk/db/base/connect.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/connect.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -56,11 +56,11 @@
check_set_default->description =
_("Check connection parameters, set if uninitialized, and exit");
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
driver->answer = (char *) db_get_default_driver_name();
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
database->answer = (char *) db_get_default_database_name();
schema = G_define_option();
Modified: grass/trunk/db/base/copy.c
===================================================================
--- grass/trunk/db/base/copy.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/copy.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -37,25 +37,25 @@
_("Either 'from_table' (optionaly with 'where') can be used "
"or 'select' option, but not 'from_table' and 'select' at the same time.");
- from_driver = G_define_standard_option(G_OPT_DRIVER);
+ from_driver = G_define_standard_option(G_OPT_DB_DRIVER);
from_driver->key = "from_driver";
from_driver->options = db_list_drivers();
from_driver->description = _("Input driver name");
if ((drv = db_get_default_driver_name()))
from_driver->answer = (char *) drv;
- from_database = G_define_standard_option(G_OPT_DATABASE);
+ from_database = G_define_standard_option(G_OPT_DB_DATABASE);
from_database->key = "from_database";
from_database->description = _("Input database name");
if ((db = db_get_default_database_name()))
from_database->answer = (char *) db;
- from_table = G_define_standard_option(G_OPT_TABLE);
+ from_table = G_define_standard_option(G_OPT_DB_TABLE);
from_table->key = "from_table";
from_table->description =
_("Input table name (only, if 'select' is not used)");
- to_driver = G_define_standard_option(G_OPT_DRIVER);
+ to_driver = G_define_standard_option(G_OPT_DB_DRIVER);
to_driver->key = "to_driver";
to_driver->options = db_list_drivers();
to_driver->required = NO;
@@ -63,19 +63,19 @@
if ((drv = db_get_default_driver_name()))
to_driver->answer = (char *) drv;
- to_database = G_define_standard_option(G_OPT_DATABASE);
+ to_database = G_define_standard_option(G_OPT_DB_DATABASE);
to_database->key = "to_database";
to_database->description = _("Output database name");
if ((db = db_get_default_database_name()))
to_database->answer = (char *) db;
- to_table = G_define_standard_option(G_OPT_TABLE);
+ to_table = G_define_standard_option(G_OPT_DB_TABLE);
to_table->key = "to_table";
to_table->required = YES;
to_table->description = _("Output table name");
to_table->gisprompt = "new,dbtable,dbtable";
- where = G_define_standard_option(G_OPT_WHERE);
+ where = G_define_standard_option(G_OPT_DB_WHERE);
select = G_define_option();
select->key = "select";
Modified: grass/trunk/db/base/createdb.c
===================================================================
--- grass/trunk/db/base/createdb.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/createdb.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -59,11 +59,11 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
driver->required = YES;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
database->required = YES;
/* Set description */
Modified: grass/trunk/db/base/databases.c
===================================================================
--- grass/trunk/db/base/databases.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/databases.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -74,7 +74,7 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
location = G_define_option();
Modified: grass/trunk/db/base/describe.c
===================================================================
--- grass/trunk/db/base/describe.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/describe.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -108,15 +108,15 @@
tdesc->key = 't';
tdesc->description = _("Print table structure");
- table = G_define_standard_option(G_OPT_TABLE);
+ table = G_define_standard_option(G_OPT_DB_TABLE);
table->required = YES;
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
if ((drv = db_get_default_driver_name()))
driver->answer = (char *) drv;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = db_get_default_database_name()))
database->answer = (char *) db;
Modified: grass/trunk/db/base/dropdb.c
===================================================================
--- grass/trunk/db/base/dropdb.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/dropdb.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -59,11 +59,11 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
driver->required = YES;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
database->required = YES;
/* Set description */
Modified: grass/trunk/db/base/droptable.c
===================================================================
--- grass/trunk/db/base/droptable.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/droptable.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -65,13 +65,13 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- table = G_define_standard_option(G_OPT_DRIVER);
+ table = G_define_standard_option(G_OPT_DB_DRIVER);
table->required = YES;
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
/* Set description */
module = G_define_module();
Modified: grass/trunk/db/base/execute.c
===================================================================
--- grass/trunk/db/base/execute.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/execute.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -110,12 +110,12 @@
input->required = NO;
input->description = _("Name of file containing SQL statements");
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
if ((drv = db_get_default_driver_name()))
driver->answer = (char *) drv;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = db_get_default_database_name()))
database->answer = (char *) db;
Modified: grass/trunk/db/base/select.c
===================================================================
--- grass/trunk/db/base/select.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/select.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -172,13 +172,13 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- table = G_define_standard_option(G_OPT_TABLE);
+ table = G_define_standard_option(G_OPT_DB_TABLE);
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = db_get_default_database_name()))
database->answer = (char *) db;
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
if ((drv = db_get_default_driver_name()))
driver->answer = (char *) drv;
Modified: grass/trunk/db/base/tables.c
===================================================================
--- grass/trunk/db/base/tables.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/base/tables.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -73,12 +73,12 @@
/* Initialize the GIS calls */
G_gisinit(argv[0]);
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
if ((drv = db_get_default_driver_name()))
driver->answer = (char *) drv;
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = db_get_default_database_name()))
database->answer = (char *) db;
Modified: grass/trunk/db/db.login/main.c
===================================================================
--- grass/trunk/db/db.login/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/db/db.login/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -43,12 +43,12 @@
module->keywords = _("database, SQL");
module->description = _("Sets user/password for driver/database.");
- driver = G_define_standard_option(G_OPT_DRIVER);
+ driver = G_define_standard_option(G_OPT_DB_DRIVER);
driver->options = db_list_drivers();
driver->required = YES;
driver->answer = db_get_default_driver_name();
- database = G_define_standard_option(G_OPT_DATABASE);
+ database = G_define_standard_option(G_OPT_DB_DATABASE);
database->required = YES;
database->answer = db_get_default_database_name();
Modified: grass/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/display/d.thematic.area/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -130,7 +130,7 @@
field_opt->description =
_("Layer number. If -1, all layers are displayed.");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
where_opt->guisection = _("Query");
bwidth_opt = G_define_option();
Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/display/d.vect/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -151,7 +151,7 @@
cat_opt = G_define_standard_option(G_OPT_V_CATS);
cat_opt->guisection = _("Query");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
where_opt->guisection = _("Query");
/* Colors */
@@ -175,7 +175,7 @@
fcolor_opt->description =
_("Either a standard GRASS color, R:G:B triplet, or \"none\"");
- rgbcol_opt = G_define_standard_option(G_OPT_COLUMN);
+ rgbcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
rgbcol_opt->key = "rgb_column";
rgbcol_opt->guisection = _("Colors");
rgbcol_opt->description = _("Name of color definition column (for use with -a flag)");
@@ -198,7 +198,7 @@
width_opt->guisection = _("Lines");
width_opt->description = _("Line width");
- wcolumn_opt = G_define_standard_option(G_OPT_COLUMN);
+ wcolumn_opt = G_define_standard_option(G_OPT_DB_COLUMN);
wcolumn_opt->key = "wcolumn";
wcolumn_opt->guisection = _("Lines");
wcolumn_opt->description =
@@ -231,7 +231,7 @@
size_opt->description = _("Symbol size");
/* Labels */
- attrcol_opt = G_define_standard_option(G_OPT_COLUMN);
+ attrcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
attrcol_opt->key = "attrcol";
attrcol_opt->multiple = NO; /* or fix attr.c, around line 102 */
attrcol_opt->guisection = _("Labels");
Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/include/gis.h 2008-08-22 15:58:28 UTC (rev 33006)
@@ -161,12 +161,12 @@
/**/ typedef enum
{
- G_OPT_WHERE, /* SQL where conditions */
- G_OPT_TABLE, /* table name */
- G_OPT_DRIVER, /* driver name */
- G_OPT_DATABASE, /* database name */
- G_OPT_COLUMN, /* one attr column */
- G_OPT_COLUMNS, /* one or more attr columns */
+ G_OPT_DB_WHERE, /* SQL where conditions */
+ G_OPT_DB_TABLE, /* table name */
+ G_OPT_DB_DRIVER, /* driver name */
+ G_OPT_DB_DATABASE, /* database name */
+ G_OPT_DB_COLUMN, /* one attr column */
+ G_OPT_DB_COLUMNS, /* one or more attr columns */
G_OPT_I_GROUP, /* old input imagery group */
G_OPT_I_SUBGROUP, /* old input imagery subgroup */
Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/lib/gis/parser.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -294,15 +294,46 @@
* If an invalid parameter was specified a empty Option structure will
* be returned (not NULL).
*
- * - general: G_OPT_WHERE, G_OPT_COLUMN, G_OPT_COLUMNS, G_OPT_TABLE, G_OPT_DRIVER, G_OPT_DATABASE
+ * - general:
+ * - G_OPT_DB_WHERE
+ * - G_OPT_DB_COLUMN
+ * - G_OPT_DB_COLUMNS
+ * - G_OPT_DB_TABLE
+ * - G_OPT_DB_DRIVER
+ * - G_OPT_DB_DATABASE
*
- * - imagery: G_OPT_I_GROUP, G_OPT_I_SUBGROUP
+ * - imagery:
+ * - G_OPT_I_GROUP
+ * - G_OPT_I_SUBGROUP
*
- * - raster: G_OPT_R_INPUT, G_OPT_R_INPUTS, G_OPT_R_OUTPUT, G_OPT_R_MAP, G_OPT_R_MAPS, G_OPT_R_BASE, G_OPT_R_COVER, G_OPT_R_ELEV, G_OPT_R_ELEVS
+ * - raster:
+ * - G_OPT_R_INPUT
+ * - G_OPT_R_INPUTS
+ * - G_OPT_R_OUTPUT
+ * - G_OPT_R_MAP
+ * - G_OPT_R_MAPS
+ * - G_OPT_R_BASE
+ * - G_OPT_R_COVER
+ * - G_OPT_R_ELEV
+ * - G_OPT_R_ELEVS
*
- * - raster3d: G_OPT_R3_INPUT, G_OPT_R3_INPUTS, G_OPT_R3_OUTPUT, G_OPT_R3_MAP, G_OPT_R3_MAPS
+ * - raster3d:
+ * - G_OPT_R3_INPUT
+ * - G_OPT_R3_INPUTS
+ * - G_OPT_R3_OUTPUT
+ * - G_OPT_R3_MAP
+ * - G_OPT_R3_MAPS
*
- * - vector: G_OPT_V_INPUT, G_OPT_V_INPUTS, G_OPT_V_OUTPUT, G_OPT_V_MAP, G_OPT_V_MAPS, G_OPT_V_TYPE, G_OPT_V_FIELD, G_OPT_V_CAT, G_OPT_V_CATS
+ * - vector:
+ * - G_OPT_V_INPUT
+ * - G_OPT_V_INPUTS
+ * - G_OPT_V_OUTPUT
+ * - G_OPT_V_MAP
+ * - G_OPT_V_MAPS
+ * - G_OPT_V_TYPE
+ * - G_OPT_V_FIELD
+ * - G_OPT_V_CAT
+ * - G_OPT_V_CATS
*
* \param[in] opt Type of Option struct to create
*
@@ -316,8 +347,7 @@
Opt = G_define_option();
switch (opt) {
- /* Database options (change to G_OPT_DB_*?) */
- case G_OPT_WHERE:
+ case G_OPT_DB_WHERE:
Opt->key = "where";
Opt->type = TYPE_STRING;
Opt->key_desc = "sql_query";
@@ -325,7 +355,7 @@
Opt->label = _("WHERE conditions of SQL statement without 'where' keyword");
Opt->description = _("Example: income < 1000 and inhab >= 10000");
break;
- case G_OPT_TABLE:
+ case G_OPT_DB_TABLE:
Opt->key = "table";
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
@@ -334,7 +364,7 @@
Opt->description = _("Table name");
Opt->gisprompt = GISPROMPT_DBTABLE;
break;
- case G_OPT_DRIVER:
+ case G_OPT_DB_DRIVER:
Opt->key = "driver";
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
@@ -342,7 +372,7 @@
Opt->multiple = NO;
Opt->description = _("Driver name");
break;
- case G_OPT_DATABASE:
+ case G_OPT_DB_DATABASE:
Opt->key = "database";
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
@@ -350,7 +380,7 @@
Opt->multiple = NO;
Opt->description = _("Database name");
break;
- case G_OPT_COLUMN:
+ case G_OPT_DB_COLUMN:
Opt->key = "column";
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
@@ -359,7 +389,7 @@
Opt->description = _("Name of attribute column");
Opt->gisprompt = GISPROMPT_DBCOLUMN;
break;
- case G_OPT_COLUMNS:
+ case G_OPT_DB_COLUMNS:
Opt->key = "columns";
Opt->type = TYPE_STRING;
Opt->key_desc = "name";
Modified: grass/trunk/swig/perl/gis.h
===================================================================
--- grass/trunk/swig/perl/gis.h 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/swig/perl/gis.h 2008-08-22 15:58:28 UTC (rev 33006)
@@ -150,9 +150,9 @@
/**/ typedef enum
{
- G_OPT_WHERE, /* SQL where conditions */
- G_OPT_COLUMN, /* one attr column */
- G_OPT_COLUMNS, /* one or more attr columns */
+ G_OPT_DB_WHERE, /* SQL where conditions */
+ G_OPT_DB_COLUMN, /* one attr column */
+ G_OPT_DB_COLUMNS, /* one or more attr columns */
G_OPT_I_GROUP, /* old input imagery group */
G_OPT_R_INPUT, /* old input raster map */
Modified: grass/trunk/swig/python/interfaces/gis.i
===================================================================
--- grass/trunk/swig/python/interfaces/gis.i 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/swig/python/interfaces/gis.i 2008-08-22 15:58:28 UTC (rev 33006)
@@ -38,7 +38,7 @@
#define NO 0
typedef enum {
- G_OPT_WHERE,
+ G_OPT_DB_WHERE,
G_OPT_R_INPUT,
G_OPT_R_OUTPUT,
G_OPT_R_MAP,
Modified: grass/trunk/vector/v.class/main.c
===================================================================
--- grass/trunk/vector/v.class/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.class/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -57,7 +57,7 @@
col_opt->multiple = NO;
col_opt->description = _("Column name or expression");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
algo_opt = G_define_option();
algo_opt->key = "algorithm";
Modified: grass/trunk/vector/v.db.connect/main.c
===================================================================
--- grass/trunk/vector/v.db.connect/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.db.connect/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -53,18 +53,18 @@
inopt = G_define_standard_option(G_OPT_V_MAP);
- dbdriver = G_define_standard_option(G_OPT_DRIVER);
+ dbdriver = G_define_standard_option(G_OPT_DB_DRIVER);
dbdriver->options = db_list_drivers();
if ((drv = G__getenv2("DB_DRIVER", G_VAR_MAPSET)))
dbdriver->answer = G_store(drv);
- dbdatabase = G_define_standard_option(G_OPT_DATABASE);
+ dbdatabase = G_define_standard_option(G_OPT_DB_DATABASE);
if ((db = G__getenv2("DB_DATABASE", G_VAR_MAPSET)))
dbdatabase->answer = G_store(db);
- dbtable = G_define_standard_option(G_OPT_TABLE);
+ dbtable = G_define_standard_option(G_OPT_DB_TABLE);
- dbkey = G_define_standard_option(G_OPT_COLUMN);
+ dbkey = G_define_standard_option(G_OPT_DB_COLUMN);
dbkey->key = "key";
dbkey->answer = "cat";
dbkey->label = _("Key column name");
Modified: grass/trunk/vector/v.db.select/main.c
===================================================================
--- grass/trunk/vector/v.db.select/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.db.select/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -51,9 +51,9 @@
map_opt = G_define_standard_option(G_OPT_V_MAP);
field_opt = G_define_standard_option(G_OPT_V_FIELD);
- col_opt = G_define_standard_option(G_OPT_COLUMNS);
+ col_opt = G_define_standard_option(G_OPT_DB_COLUMNS);
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
fs_opt = G_define_standard_option(G_OPT_F_SEP);
fs_opt->description = _("Output field separator");
Modified: grass/trunk/vector/v.distance/main.c
===================================================================
--- grass/trunk/vector/v.distance/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.distance/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -193,20 +193,20 @@
/* "from_y - y coordinate of the nearest point on 'from' feature;" */
/* "from_along - distance to the nearest point on 'from' feature along linear feature;" */
- column_opt = G_define_standard_option(G_OPT_COLUMN);
+ column_opt = G_define_standard_option(G_OPT_DB_COLUMN);
column_opt->required = YES;
column_opt->multiple = YES;
column_opt->description =
_("Column name(s) where values specified by 'upload' option will be uploaded");
column_opt->guisection = _("From_map");
- to_column_opt = G_define_standard_option(G_OPT_COLUMN);
+ to_column_opt = G_define_standard_option(G_OPT_DB_COLUMN);
to_column_opt->key = "to_column";
to_column_opt->description =
_("Column name of nearest feature (used with upload=to_attr)");
to_column_opt->guisection = _("To_map");
- table_opt = G_define_standard_option(G_OPT_TABLE);
+ table_opt = G_define_standard_option(G_OPT_DB_TABLE);
table_opt->description =
_("Name of table created for output when the distance to all flag is used");
Modified: grass/trunk/vector/v.edit/args.c
===================================================================
--- grass/trunk/vector/v.edit/args.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.edit/args.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -158,7 +158,7 @@
params->poly->description = _("Polygon for selecting features");
params->poly->guisection = _("Query");
- params->where = G_define_standard_option(G_OPT_WHERE);
+ params->where = G_define_standard_option(G_OPT_DB_WHERE);
params->where->guisection = _("Query");
params->query = G_define_option();
Modified: grass/trunk/vector/v.extract/main.c
===================================================================
--- grass/trunk/vector/v.extract/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.extract/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -121,7 +121,7 @@
_("Input text file with category numbers/number ranges to be extracted");
fileopt->description = _("If '-' given reads from standard input");
- whereopt = G_define_standard_option(G_OPT_WHERE);
+ whereopt = G_define_standard_option(G_OPT_DB_WHERE);
/* heeeerrrrrre's the PARSER */
if (G_parser(argc, argv))
Modified: grass/trunk/vector/v.extrude/main.c
===================================================================
--- grass/trunk/vector/v.extrude/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.extrude/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -97,7 +97,7 @@
height->multiple = NO;
height->description = _("Fixed height for 3D vector objects");
- hcolumn = G_define_standard_option(G_OPT_COLUMN);
+ hcolumn = G_define_standard_option(G_OPT_DB_COLUMN);
hcolumn->key = "hcolumn";
hcolumn->multiple = NO;
hcolumn->description = _("Name of attribute column with object heights");
Modified: grass/trunk/vector/v.generalize/main.c
===================================================================
--- grass/trunk/vector/v.generalize/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.generalize/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -202,7 +202,7 @@
field_opt = G_define_standard_option(G_OPT_V_FIELD);
cat_opt = G_define_standard_option(G_OPT_V_CATS);
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
ca_flag = G_define_flag();
Modified: grass/trunk/vector/v.in.db/main.c
===================================================================
--- grass/trunk/vector/v.in.db/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.in.db/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -53,38 +53,38 @@
module->description =
_("Creates new vector (points) map from database table containing coordinates.");
- table_opt = G_define_standard_option(G_OPT_TABLE);
+ table_opt = G_define_standard_option(G_OPT_DB_TABLE);
table_opt->required = YES;
table_opt->description = _("Input table name");
- driver_opt = G_define_standard_option(G_OPT_DRIVER);
+ driver_opt = G_define_standard_option(G_OPT_DB_DRIVER);
driver_opt->options = db_list_drivers();
driver_opt->answer = db_get_default_driver_name();
- database_opt = G_define_standard_option(G_OPT_DATABASE);
+ database_opt = G_define_standard_option(G_OPT_DB_DATABASE);
database_opt->answer = db_get_default_database_name();
- xcol_opt = G_define_standard_option(G_OPT_COLUMN);
+ xcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
xcol_opt->key = "x";
xcol_opt->required = YES;
xcol_opt->description = _("Name of column containing x coordinate");
- ycol_opt = G_define_standard_option(G_OPT_COLUMN);
+ ycol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
ycol_opt->key = "y";
ycol_opt->required = YES;
ycol_opt->description = _("Name of column containing y coordinate");
- zcol_opt = G_define_standard_option(G_OPT_COLUMN);
+ zcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
zcol_opt->key = "z";
zcol_opt->description = _("Name of column containing z coordinate");
- keycol_opt = G_define_standard_option(G_OPT_COLUMN);
+ keycol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
keycol_opt->key = "key";
keycol_opt->required = YES;
keycol_opt->description = _("Name of column containing category number");
keycol_opt->description = _("Must refer to an integer column");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
outvect = G_define_standard_option(G_OPT_V_OUTPUT);
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.in.ogr/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -140,7 +140,7 @@
spat_opt->description =
_("Format: xmin,ymin,xmax,ymax - usually W,S,E,N");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
where_opt->guisection = _("Query");
min_area_opt = G_define_option();
Modified: grass/trunk/vector/v.label/main.c
===================================================================
--- grass/trunk/vector/v.label/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.label/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -74,7 +74,7 @@
Vectfile = G_define_standard_option(G_OPT_V_MAP);
- Colopt = G_define_standard_option(G_OPT_COLUMN);
+ Colopt = G_define_standard_option(G_OPT_DB_COLUMN);
Colopt->required = YES;
Colopt->description = _("Name of attribute column to be used for labels");
@@ -83,7 +83,7 @@
Typopt->answer = "point,line,boundary,centroid";
Fieldopt = G_define_standard_option(G_OPT_V_FIELD);
- whereopt = G_define_standard_option(G_OPT_WHERE);
+ whereopt = G_define_standard_option(G_OPT_DB_WHERE);
Along_flag = G_define_flag();
Along_flag->key = 'a';
Modified: grass/trunk/vector/v.random/main.c
===================================================================
--- grass/trunk/vector/v.random/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.random/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -108,7 +108,7 @@
_("Maximum z height (needs -z flag or column name)");
parm.zmax->answer = "0.0";
- parm.zcol = G_define_standard_option(G_OPT_COLUMN);
+ parm.zcol = G_define_standard_option(G_OPT_DB_COLUMN);
parm.zcol->key = "column";
parm.zcol->required = NO;
parm.zcol->multiple = NO;
Modified: grass/trunk/vector/v.reclass/main.c
===================================================================
--- grass/trunk/vector/v.reclass/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.reclass/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -74,7 +74,7 @@
rules_opt->required = NO;
rules_opt->description = _("Full path to the reclass rule file");
- col_opt = G_define_standard_option(G_OPT_COLUMN);
+ col_opt = G_define_standard_option(G_OPT_DB_COLUMN);
col_opt->label =
_("The name of the column whose values are to be used as new categories");
col_opt->description = _("The column must be type integer or string");
Modified: grass/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.surf.rst/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -193,7 +193,7 @@
parm.zcol->description =
_("Name of the attribute column with values to be used for approximation (if layer>0)");
- parm.wheresql = G_define_standard_option(G_OPT_WHERE);
+ parm.wheresql = G_define_standard_option(G_OPT_DB_WHERE);
parm.elev = G_define_standard_option(G_OPT_R_OUTPUT);
parm.elev->key = "elev";
Modified: grass/trunk/vector/v.to.db/parse.c
===================================================================
--- grass/trunk/vector/v.to.db/parse.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.to.db/parse.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -83,9 +83,9 @@
parms.units->description =
_("mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares)");
- parms.col = G_define_standard_option(G_OPT_COLUMNS);
+ parms.col = G_define_standard_option(G_OPT_DB_COLUMNS);
- parms.qcol = G_define_standard_option(G_OPT_COLUMN);
+ parms.qcol = G_define_standard_option(G_OPT_DB_COLUMN);
parms.qcol->key = "qcolumn";
parms.qcol->label = _("Name of attribute column used for 'query' option");
parms.qcol->description = _("E.g. 'cat', 'count(*)', 'sum(val)'");
Modified: grass/trunk/vector/v.to.rast/main.c
===================================================================
--- grass/trunk/vector/v.to.rast/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.to.rast/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -63,7 +63,7 @@
field_opt = G_define_standard_option(G_OPT_V_FIELD);
/* for GRASS 7, IMHO this should be changed to "attrcolumn" */
- col = G_define_standard_option(G_OPT_COLUMN);
+ col = G_define_standard_option(G_OPT_DB_COLUMN);
col->description =
_("Name of column for attr parameter (data type must be numeric)");
col->guisection = _("Attributes");
@@ -84,13 +84,13 @@
rows->answer = "4096";
rows->description = _("Number of rows to hold in memory");
- rgbcol_opt = G_define_standard_option(G_OPT_COLUMN);
+ rgbcol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
rgbcol_opt->key = "rgbcolumn";
rgbcol_opt->description =
_("Name of color definition column (with RRR:GGG:BBB entries)");
rgbcol_opt->guisection = _("Attributes");
- label_opt = G_define_standard_option(G_OPT_COLUMN);
+ label_opt = G_define_standard_option(G_OPT_DB_COLUMN);
label_opt->key = "labelcolumn";
label_opt->description =
_("Name of column used as raster category labels");
Modified: grass/trunk/vector/v.transform/main.c
===================================================================
--- grass/trunk/vector/v.transform/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.transform/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -184,12 +184,12 @@
zrot->answer = "0.0";
zrot->guisection = _("Custom");
- table = G_define_standard_option(G_OPT_TABLE);
+ table = G_define_standard_option(G_OPT_DB_TABLE);
table->description =
_("Name of table containing transformation parameters");
table->guisection = _("Custom");
- columns = G_define_standard_option(G_OPT_COLUMNS);
+ columns = G_define_standard_option(G_OPT_DB_COLUMNS);
columns->label =
_("Name of attribute column(s) used as transformation parameters");
columns->description =
Modified: grass/trunk/vector/v.univar/main.c
===================================================================
--- grass/trunk/vector/v.univar/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.univar/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -78,7 +78,7 @@
col_opt->multiple = NO;
col_opt->description = _("Column name");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
field_opt = G_define_standard_option(G_OPT_V_FIELD);
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.vol.rst/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -288,7 +288,7 @@
_("Name of the column with smoothing parameters");
parm.scol->guisection = _("Settings");
- parm.wheresql = G_define_standard_option(G_OPT_WHERE);
+ parm.wheresql = G_define_standard_option(G_OPT_DB_WHERE);
parm.devi = G_define_option();
parm.devi->key = "devi";
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2008-08-22 15:54:05 UTC (rev 33005)
+++ grass/trunk/vector/v.what.rast/main.c 2008-08-22 15:58:28 UTC (rev 33006)
@@ -99,7 +99,7 @@
col_opt->description =
_("Column name (will be updated by raster values)");
- where_opt = G_define_standard_option(G_OPT_WHERE);
+ where_opt = G_define_standard_option(G_OPT_DB_WHERE);
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
More information about the grass-commit
mailing list