fix managelib and modules to understand new element names

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

general/g.list/main.c

@@ -385,11 +385,11 @@ static void make_list(FILE *fp, const struct list *elem, const char *mapset,
     if ((list = G__ls(path, &count)) == NULL)
 	return;
 
-    if (strcmp(alias, "rast") == 0)
+    if (strcmp(alias, "raster") == 0)
 	type = TYPE_RAST;
-    else if (strcmp(alias, "rast3d") == 0)
+    else if (strcmp(alias, "3draster") == 0)
 	type = TYPE_RAST3D;
-    else if (strcmp(alias, "vect") == 0)
+    else if (strcmp(alias, "vector") == 0)
 	type = TYPE_VECT;
     else
 	type = TYPE_OTHERS;

general/g.remove/main.c

@@ -235,7 +235,7 @@ int main(int argc, char *argv[])
 	if (access(path, 0) != 0)
 	    continue;
 
-	rast = !G_strcasecmp(elem->alias, "rast");
+	rast = !G_strcasecmp(elem->alias, "raster");
 	files = G__ls(path, &num_files);
 
 	for (j = 0; j < num_files; j++) {

general/g.rename/main.c

@@ -93,7 +93,7 @@ int main(int argc, char *argv[])
 		result = EXIT_FAILURE;
 	    }
 
-	    if (!renamed && strcmp(parm[n]->key, "rast") == 0 &&
+	    if (!renamed && strcmp(parm[n]->key, "raster") == 0 &&
 		Rast_is_reclassed_to(old, mapset, &nrmaps, &rmaps) > 0) {
 		int ptr, l;
 		char buf1[256], buf2[256], buf3[256], *str;

lib/manage/do_copy.c

@@ -34,7 +34,7 @@
 */
 int M_do_copy(int n, const char *old, const char *mapset, const char *new)
 {
-    int i, ret, len;
+    int i, ret;
     char path[GPATH_MAX], path2[GPATH_MAX];
     int result = 0;
 
@@ -43,10 +43,8 @@ int M_do_copy(int n, const char *old, const char *mapset, const char *new)
     G_message(_("Copy %s <%s> to current mapset as <%s>"),
 	      list[n].maindesc, G_fully_qualified_name(old, mapset), new);
 
-    len = M__get_description_len(n);
-
     M__hold_signals(1);
-    if (G_strcasecmp(list[n].alias, "vect") == 0) {
+    if (G_strcasecmp(list[n].alias, "vector") == 0) {
 	ret = Vect_copy(old, mapset, new);
 	if (ret == -1) {
 	    G_warning(_("Unable to copy <%s> to current mapset as <%s>"),

lib/manage/do_remove.c

@@ -52,7 +52,7 @@ int M_do_remove(int n, const char *old)
 	old = xname;
     }
 
-    if (G_strcasecmp(list[n].alias, "vect") == 0) {
+    if (G_strcasecmp(list[n].alias, "vector") == 0) {
 	if ((mapset = G_find_vector2(old, "")) == NULL) {
 	    G_warning(_("Vector map <%s> not found"), old);
 	}
@@ -68,12 +68,12 @@ int M_do_remove(int n, const char *old)
 	}
     }
     else {
-	if (G_strcasecmp(list[n].alias, "rast") == 0) {
+	if (G_strcasecmp(list[n].alias, "raster") == 0) {
 	    if ((mapset = G_find_raster2(old, "")) == NULL)
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 
-	if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
+	if (G_strcasecmp(list[n].alias, "3draster") == 0) {
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}

lib/manage/do_rename.c

@@ -49,7 +49,7 @@ int M_do_rename(int n, const char *old, const char *new)
 
     M__hold_signals(1);
 
-    if (G_strcasecmp(list[n].alias, "vect") == 0) {
+    if (G_strcasecmp(list[n].alias, "vector") == 0) {
 	if ((mapset = G_find_vector2(old, "")) == NULL) {
 	    G_warning(_("Vector map <%s> not found"), old);
 	}
@@ -66,12 +66,12 @@ int M_do_rename(int n, const char *old, const char *new)
 	}
     }
     else {
-	if (G_strcasecmp(list[n].alias, "rast") == 0) {
+	if (G_strcasecmp(list[n].alias, "raster") == 0) {
 	    if ((mapset = G_find_raster2(old, "")) == NULL)
 		G_warning(_("Raster map <%s> not found"), old);
 	}
 
-	if (G_strcasecmp(list[n].alias, "rast3d") == 0) {
+	if (G_strcasecmp(list[n].alias, "3draster") == 0) {
 	    if ((mapset = G_find_raster3d(old, "")) == NULL)
 		G_warning(_("3D raster map <%s> not found"), old);
 	}

lib/manage/option.c

@@ -47,10 +47,11 @@ struct Option* M_define_option(int n, const char *desc, int multiple)
     G_asprintf(&str, _("%s to be %s"),
 	       list[n].text, desc);
     p->description = str;
-    if (strcmp(p->key, "rast") == 0 || strcmp(p->key, "rast3d") == 0)
+    if (strcmp(p->key, "raster") == 0 || strcmp(p->key, "3draster") == 0)
 	p->guisection = _("Raster");
-    else if (strcmp(p->key, "vect") == 0 || strcmp(p->key, "oldvect") == 0 ||
-	     strcmp(p->key, "asciivect") == 0)
+    else if (strcmp(p->key, "vector") == 0 ||
+             strcmp(p->key, "oldvector") == 0 ||
+	     strcmp(p->key, "asciivector") == 0)
 	p->guisection = _("Vector");
     else if (strcmp(p->key, "region") == 0 || strcmp(p->key, "region3d") == 0)
 	p->guisection = _("Region");

raster/r.reclass/reclass.c

@@ -230,7 +230,7 @@ int reclass(const char *old_name, const char *old_mapset,
     if (G_find_file2("cell", new_name, G_mapset()) &&
 	Rast_map_type(new_name, G_mapset()) != CELL_TYPE) {
 	M_read_list(FALSE, NULL);
-        if (M_do_remove(M_get_element("rast"), new_name) == 1)
+        if (M_do_remove(M_get_element("raster"), new_name) == 1)
 	    G_fatal_error(_("Cannot overwrite existing raster map <%s>"),
 			  new_name);
     }