[GRASS-SVN] r41802 - in grass/trunk: raster/r.in.gdal
vector/v.in.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 11 12:12:04 EDT 2010
Author: martinl
Date: 2010-04-11 12:12:03 -0400 (Sun, 11 Apr 2010)
New Revision: 41802
Modified:
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/vector/v.in.ogr/main.c
Log:
sync r.in.gdal/v.in.ogr -f output
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2010-04-11 15:50:01 UTC (rev 41801)
+++ grass/trunk/raster/r.in.gdal/main.c 2010-04-11 16:12:03 UTC (rev 41802)
@@ -203,7 +203,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;
@@ -215,7 +215,7 @@
else
pszRWFlag = "ro";
- fprintf(stdout, " %s (%s): %s\n",
+ fprintf(stdout, " %s (%s): %s\n",
GDALGetDriverShortName(hDriver),
pszRWFlag, GDALGetDriverLongName(hDriver));
}
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2010-04-11 15:50:01 UTC (rev 41801)
+++ grass/trunk/vector/v.in.ogr/main.c 2010-04-11 16:12:03 UTC (rev 41802)
@@ -262,15 +262,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);
}
More information about the grass-commit
mailing list