[GRASS-SVN] r31511 - grass/trunk/vector/v.out.dxf

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-05-24 12:08:55 -0400 (Sat, 24 May 2008)
New Revision: 31511

Modified:
   grass/trunk/vector/v.out.dxf/main.c
Log:
v.out.dxf: message cosmetics
Do not use fully qualified mapname for output 
[merge from devbr6, r31510]


Modified: grass/trunk/vector/v.out.dxf/main.c
===================================================================
--- grass/trunk/vector/v.out.dxf/main.c	2008-05-24 16:06:36 UTC (rev 31510)
+++ grass/trunk/vector/v.out.dxf/main.c	2008-05-24 16:08:55 UTC (rev 31511)
@@ -34,6 +34,7 @@
 
 int main(int argc, char *argv[])
 {
+    int nlines;
     double textsize;
     char *mapset, *dxf_file;
     struct Map_info In;
@@ -69,26 +70,32 @@
     if (output->answer)
 	dxf_file = G_store(output->answer);
     else {
+	char fname[GNAME_MAX];
+	char fmapset[GMAPSET_MAX];
 	dxf_file = G_malloc(strlen(input->answer) + 5);
-	sprintf(dxf_file, "%s.dxf", input->answer);
+	if (G__name_is_fully_qualified(input->answer, fname, fmapset))
+	    sprintf(dxf_file, "%s.dxf", fname);
+	else
+	    sprintf(dxf_file, "%s.dxf", input->answer);
     }
 
     Vect_set_open_level(2);
     Vect_open_old(&In, input->answer, mapset);
 
     dxf_open(dxf_file);		/* open output */
-    G_free(dxf_file);
 
     textsize = do_limits(&In);	/* does header in dxf_fp */
     make_layername();
     dxf_entities();
-    add_plines(&In, textsize);	/* puts plines in dxf_fp */
+    nlines = add_plines(&In, textsize);	/* puts plines in dxf_fp */
 
     dxf_endsec();
     dxf_eof();			/* puts final stuff in dxf_fp, closes file */
 
-    G_done_msg("");
+    G_done_msg(_("%d features written to '%s'."), nlines, dxf_file);
 
+    G_free(dxf_file);
+
     exit(EXIT_SUCCESS);
 }
 
@@ -189,7 +196,5 @@
 	}
     }
 
-    G_message (_("%d features written"), nlines);
-
-    return 0;
+    return nlines;
 }