[GRASS-SVN] r45069 - grass/branches/develbranch_6/general/g.findfile

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-17 09:50:32 -0800 (Mon, 17 Jan 2011)
New Revision: 45069

Modified:
   grass/branches/develbranch_6/general/g.findfile/main.c
Log:
g.findfile should return unqualified name
(merge r45068 from trunk)


Modified: grass/branches/develbranch_6/general/g.findfile/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.findfile/main.c	2011-01-17 17:42:26 UTC (rev 45068)
+++ grass/branches/develbranch_6/general/g.findfile/main.c	2011-01-17 17:50:32 UTC (rev 45069)
@@ -32,7 +32,7 @@
     struct Flag *n_flag;
 
     module = G_define_module();
-    module->keywords = _("general");
+    module->keywords = _("general, data base files");
     module->description =
 	_("Searches for GRASS data base files "
 	  "and sets variables for the shell.");
@@ -57,8 +57,8 @@
     mapset_opt->key = "mapset";
     mapset_opt->type = TYPE_STRING;
     mapset_opt->required = NO;
-    mapset_opt->description = _("Name of a mapset");
-    mapset_opt->answer = "";
+    mapset_opt->label = _("Name of a mapset (default: search path)");
+    mapset_opt->description = _("'.' for current mapset");
 
     n_flag = G_define_flag();
     n_flag->key = 'n';
@@ -68,6 +68,9 @@
 	exit(EXIT_FAILURE);
 
     search_mapset = mapset_opt->answer;
+    if (!search_mapset) {
+	search_mapset = G_store("");
+    }
     if (strcmp(".", search_mapset) == 0)
 	search_mapset = G_mapset();
     
@@ -91,13 +94,17 @@
 
     mapset = G_find_file2(elem_opt->answer, name, search_mapset);
     if (mapset) {
+	char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
 	const char *qchar = n_flag->answer ? "" : "'";
 	const char *qual = G_fully_qualified_name(name, mapset);
+	G_unqualified_name(name, mapset, xname, xmapset);
 	G__file_name(file, elem_opt->answer, name, mapset);
-	fprintf(stdout, "name=%s%s%s\n", qchar, name, qchar);
-	fprintf(stdout, "mapset=%s%s%s\n", qchar, mapset, qchar);
+	fprintf(stdout, "name=%s%s%s\n", qchar, xname, qchar);
+	fprintf(stdout, "mapset=%s%s%s\n", qchar, xmapset, qchar);
 	fprintf(stdout, "fullname=%s%s%s\n", qchar, qual, qchar);
 	fprintf(stdout, "file=%s%s%s\n", qchar, file, qchar);
+
+	return EXIT_SUCCESS;
     }
     else {
 	fprintf(stdout, "name=\n");
@@ -106,5 +113,5 @@
 	fprintf(stdout, "file=\n");
     }
     
-    exit(mapset == NULL);
+    return EXIT_FAILURE;
 }