[GRASS-SVN] r41805 - in grass/branches/develbranch_6: raster/r.in.gdal vector/v.in.ogr

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-11 12:46:09 -0400 (Sun, 11 Apr 2010)
New Revision: 41805

Modified:
   grass/branches/develbranch_6/raster/r.in.gdal/main.c
   grass/branches/develbranch_6/vector/v.in.ogr/main.c
Log:
sync r.in.gdal/v.in.ogr -f output
(merge r41802 from trunk)


Modified: grass/branches/develbranch_6/raster/r.in.gdal/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.in.gdal/main.c	2010-04-11 16:44:35 UTC (rev 41804)
+++ grass/branches/develbranch_6/raster/r.in.gdal/main.c	2010-04-11 16:46:09 UTC (rev 41805)
@@ -191,7 +191,7 @@
     if (flag_f->answer) {
 	int iDr;
 
-	fprintf(stdout, _("Supported Formats:\n"));
+	G_message(_("Available GDAL Drivers:"));
 	for (iDr = 0; iDr < GDALGetDriverCount(); iDr++) {
 	    GDALDriverH hDriver = GDALGetDriver(iDr);
 	    const char *pszRWFlag;
@@ -203,7 +203,7 @@
 	    else
 		pszRWFlag = "ro";
 
-	    fprintf(stdout, "  %s (%s): %s\n",
+	    fprintf(stdout, " %s (%s): %s\n",
 		    GDALGetDriverShortName(hDriver),
 		    pszRWFlag, GDALGetDriverLongName(hDriver));
 	}

Modified: grass/branches/develbranch_6/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.in.ogr/main.c	2010-04-11 16:44:35 UTC (rev 41804)
+++ grass/branches/develbranch_6/vector/v.in.ogr/main.c	2010-04-11 16:46:09 UTC (rev 41805)
@@ -252,15 +252,17 @@
 
 	for (iDriver = 0; iDriver < OGRGetDriverCount(); iDriver++) {
 	    OGRSFDriverH poDriver = OGRGetDriver(iDriver);
-
+	    const char *pszRWFlag;
+	    
 	    if (OGR_Dr_TestCapability(poDriver, ODrCCreateDataSource))
-		fprintf(stdout, "  %s (read/write)\n",
-			OGR_Dr_GetName(poDriver));
+		pszRWFlag = "rw";
 	    else
-		fprintf(stdout, "  %s (readonly)\n",
-			OGR_Dr_GetName(poDriver));
+		pszRWFlag = "ro";
+
+	    fprintf(stdout, " %s (%s): %s\n",
+		    OGR_Dr_GetName(poDriver),
+		    pszRWFlag, OGR_Dr_GetName(poDriver));
 	}
-
 	exit(EXIT_SUCCESS);
     }