[GRASS-SVN] r31418 - grass/branches/develbranch_6/lib/imagery

[svn_grass at osgeo.org]

Author: glynn
Date: 2008-05-19 03:12:34 -0400 (Mon, 19 May 2008)
New Revision: 31418

Modified:
   grass/branches/develbranch_6/lib/imagery/fopen.c
   grass/branches/develbranch_6/lib/imagery/group.c
Log:
Merge r31416, r31417 from trunk


Modified: grass/branches/develbranch_6/lib/imagery/fopen.c
===================================================================
--- grass/branches/develbranch_6/lib/imagery/fopen.c	2008-05-19 07:03:40 UTC (rev 31417)
+++ grass/branches/develbranch_6/lib/imagery/fopen.c	2008-05-19 07:12:34 UTC (rev 31418)
@@ -74,6 +74,10 @@
     FILE *fd;
     char element[GNAME_MAX*2];
 
+    /* create subgroup directory */
+    sprintf(element, "%s/subgroup/%s", group, subgroup);
+    G__make_mapset_element_misc("group", element);
+
     /* get subgroup element name */
     sprintf (element, "subgroup/%s/%s", subgroup, file);
 
@@ -95,6 +99,10 @@
     FILE *fd;
     char element[GNAME_MAX*2];
 
+    /* create subgroup directory */
+    sprintf(element, "%s/subgroup/%s", group, subgroup);
+    G__make_mapset_element_misc("group", element);
+
     /* get subgroup element name */
     sprintf (element, "subgroup/%s/%s", subgroup, file);
 

Modified: grass/branches/develbranch_6/lib/imagery/group.c
===================================================================
--- grass/branches/develbranch_6/lib/imagery/group.c	2008-05-19 07:03:40 UTC (rev 31417)
+++ grass/branches/develbranch_6/lib/imagery/group.c	2008-05-19 07:12:34 UTC (rev 31418)
@@ -65,7 +65,6 @@
 int I_get_subgroup (char *group,char *subgroup)
 {
     FILE *fd;
-    FILE *I_fopen_group_file_old();
     int stat;
 
     *subgroup = 0;
@@ -85,7 +84,6 @@
 int I_put_subgroup(char *group,char *subgroup)
 {
     FILE *fd;
-    FILE *I_fopen_group_file_new();
 
     if (!I_find_group(group))
 	return 0;
@@ -150,8 +148,6 @@
     char name[INAME_LEN], mapset[INAME_LEN];
     char color[20];
     FILE *fd;
-    FILE *I_fopen_group_ref_old();
-    FILE *I_fopen_subgroup_ref_old();
 
     I_init_group_ref (ref);
 
@@ -295,10 +291,7 @@
 {
     int n;
     FILE *fd;
-    FILE *I_fopen_group_ref_new();
-    FILE *I_fopen_subgroup_ref_new();
 
-
     if (*subgroup == 0)
 	fd = I_fopen_group_ref_new(group) ;
     else