[GRASS-SVN] r50919 - in grass/trunk: general/g.parser include lib/gis

[svn_grass at osgeo.org]

Author: huhabla
Date: 2012-02-22 07:08:18 -0800 (Wed, 22 Feb 2012)
New Revision: 50919

Modified:
   grass/trunk/general/g.parser/standard_option.c
   grass/trunk/include/gis.h
   grass/trunk/lib/gis/parser_standard_options.c
Log:
New standard options and modifcation of g.parser to recognize them.


Modified: grass/trunk/general/g.parser/standard_option.c
===================================================================
--- grass/trunk/general/g.parser/standard_option.c	2012-02-21 18:49:59 UTC (rev 50918)
+++ grass/trunk/general/g.parser/standard_option.c	2012-02-22 15:08:18 UTC (rev 50919)
@@ -110,6 +110,42 @@
 	key = G_OPT_M_EN;
     else if (G_strcasecmp(name, "G_OPT_V_MAP") == 0)
 	key = G_OPT_V_MAP;
+    else if (G_strcasecmp(name, "G_OPT_STDS_INPUT") == 0)
+	key = G_OPT_STDS_INPUT;
+    else if (G_strcasecmp(name, "G_OPT_STDS_INPUTS") == 0)
+	key = G_OPT_STDS_INPUTS;
+    else if (G_strcasecmp(name, "G_OPT_STDS_OUTPUT") == 0)
+	key = G_OPT_STDS_OUTPUT;
+    else if (G_strcasecmp(name, "G_OPT_STRDS_INPUT") == 0)
+	key = G_OPT_STRDS_INPUT;
+    else if (G_strcasecmp(name, "G_OPT_STRDS_INPUTS") == 0)
+	key = G_OPT_STRDS_INPUTS;
+    else if (G_strcasecmp(name, "G_OPT_STRDS_OUTPUT") == 0)
+	key = G_OPT_STRDS_OUTPUT;
+    else if (G_strcasecmp(name, "G_OPT_STR3DS_INPUT") == 0)
+	key = G_OPT_STR3DS_INPUT;
+    else if (G_strcasecmp(name, "G_OPT_STR3DS_INPUTS") == 0)
+	key = G_OPT_STR3DS_INPUTS;
+    else if (G_strcasecmp(name, "G_OPT_STR3DS_OUTPUT") == 0)
+	key = G_OPT_STR3DS_OUTPUT;
+    else if (G_strcasecmp(name, "G_OPT_STVDS_INPUT") == 0)
+	key = G_OPT_STVDS_INPUT;
+    else if (G_strcasecmp(name, "G_OPT_STVDS_INPUTS") == 0)
+	key = G_OPT_STVDS_INPUTS;
+    else if (G_strcasecmp(name, "G_OPT_STVDS_OUTPUT") == 0)
+	key = G_OPT_STVDS_OUTPUT;
+    else if (G_strcasecmp(name, "G_OPT_MAP_INPUT") == 0)
+	key = G_OPT_MAP_INPUT;
+    else if (G_strcasecmp(name, "G_OPT_MAP_INPUTS") == 0)
+	key = G_OPT_MAP_INPUTS;
+    else if (G_strcasecmp(name, "G_OPT_STDS_TYPE") == 0)
+	key = G_OPT_STDS_TYPE;
+    else if (G_strcasecmp(name, "G_OPT_MAP_TYPE") == 0)
+	key = G_OPT_MAP_TYPE;
+    else if (G_strcasecmp(name, "G_OPT_T_TYPE") == 0)
+	key = G_OPT_T_TYPE;
+    else if (G_strcasecmp(name, "G_OPT_T_WHERE") == 0)
+	key = G_OPT_T_WHERE;
 
     if (key == G_OPT_UNDEFINED)
 	opt = G_define_option();

Modified: grass/trunk/include/gis.h
===================================================================
--- grass/trunk/include/gis.h	2012-02-21 18:49:59 UTC (rev 50918)
+++ grass/trunk/include/gis.h	2012-02-22 15:08:18 UTC (rev 50919)
@@ -233,6 +233,7 @@
 
     G_OPT_STDS_INPUT,           /* old input space time dataset of type strds, str3ds or stvds */
     G_OPT_STDS_INPUTS,          /* old input space time datasets */
+    G_OPT_STDS_OUTPUT,          /* new output space time dataset */
     G_OPT_STRDS_INPUT,          /* old input space time raster dataset */
     G_OPT_STRDS_INPUTS,         /* old input space time raster datasets */
     G_OPT_STRDS_OUTPUT,         /* new output space time raster dataset */

Modified: grass/trunk/lib/gis/parser_standard_options.c
===================================================================
--- grass/trunk/lib/gis/parser_standard_options.c	2012-02-21 18:49:59 UTC (rev 50918)
+++ grass/trunk/lib/gis/parser_standard_options.c	2012-02-22 15:08:18 UTC (rev 50919)
@@ -95,6 +95,7 @@
   - temporal GIS framework
    - G_OPT_STDS_INPUT
    - G_OPT_STDS_INPUTS
+   - G_OPT_STDS_OUTPUT
    - G_OPT_STRDS_INPUT
    - G_OPT_STRDS_INPUTS
    - G_OPT_STRDS_OUTPUT
@@ -619,6 +620,14 @@
 	Opt->gisprompt = "old,stds,stds";
 	Opt->description = _("Name of the input space time datasets");
 	break;
+    case G_OPT_STDS_OUTPUT:
+	Opt->key = "output";
+	Opt->type = TYPE_STRING;
+	Opt->key_desc = "name";
+	Opt->required = YES;
+	Opt->gisprompt = "new,stds,stds";
+	Opt->description = _("Name of the output space time dataset");
+	break;
     case G_OPT_STRDS_INPUT:
 	Opt->key = "input";
 	Opt->type = TYPE_STRING;