[GRASS-SVN] r31462 - in grass/branches/develbranch_6: include lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-05-21 09:17:42 -0400 (Wed, 21 May 2008)
New Revision: 31462

Modified:
   grass/branches/develbranch_6/include/gis.h
   grass/branches/develbranch_6/lib/gis/parser.c
Log:
added G_OPT_I_SUBGROUP (merge from trunk)

Modified: grass/branches/develbranch_6/include/gis.h
===================================================================
--- grass/branches/develbranch_6/include/gis.h	2008-05-21 13:04:10 UTC (rev 31461)
+++ grass/branches/develbranch_6/include/gis.h	2008-05-21 13:17:42 UTC (rev 31462)
@@ -160,6 +160,7 @@
     G_OPT_COLUMNS,  /* one or more attr columns */
 
     G_OPT_I_GROUP,  /* old input imagery group */
+    G_OPT_I_SUBGROUP,  /* old input imagery subgroup */
     G_OPT_R_INPUT,  /* old input raster map */
     G_OPT_R_INPUTS, /* old input raster maps */
     G_OPT_R_OUTPUT, /* new output raster map */

Modified: grass/branches/develbranch_6/lib/gis/parser.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/parser.c	2008-05-21 13:04:10 UTC (rev 31461)
+++ grass/branches/develbranch_6/lib/gis/parser.c	2008-05-21 13:17:42 UTC (rev 31462)
@@ -315,7 +315,7 @@
  *
  * - general: G_OPT_WHERE, G_OPT_COLUMN, G_OPT_COLUMNS, G_OPT_TABLE, G_OPT_DRIVER, G_OPT_DATABASE
  *
- * - imagery: G_OPT_I_GROUP
+ * - 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
  *
@@ -395,6 +395,14 @@
 	    Opt->gisprompt    = "old,group,group";
 	    Opt->description  = _("Name of input imagery group");
             break;
+        case G_OPT_I_SUBGROUP:
+	    Opt->key          = "subgroup";
+	    Opt->type         = TYPE_STRING;
+	    Opt->key_desc     = "name";
+	    Opt->required     = YES;
+	    Opt->gisprompt    = "old,subgroup,subgroup";
+	    Opt->description  = _("Name of input imagery subgroup");
+            break;
 
 	/* raster maps */    
 	case G_OPT_R_INPUT: