[GRASS-SVN] r74146 - grass/branches/releasebranch_7_6/vector/v.external

[svn_grass at osgeo.org]

Author: mmetz
Date: 2019-03-01 11:48:05 -0800 (Fri, 01 Mar 2019)
New Revision: 74146

Modified:
   grass/branches/releasebranch_7_6/vector/v.external/dsn.c
   grass/branches/releasebranch_7_6/vector/v.external/main.c
Log:
v.external: enable GRASS-internal PostGIS driver again (backport trunk r74145)

Modified: grass/branches/releasebranch_7_6/vector/v.external/dsn.c
===================================================================
--- grass/branches/releasebranch_7_6/vector/v.external/dsn.c	2019-03-01 19:47:21 UTC (rev 74145)
+++ grass/branches/releasebranch_7_6/vector/v.external/dsn.c	2019-03-01 19:48:05 UTC (rev 74146)
@@ -8,12 +8,6 @@
 {
     char *dsn;
 
-    dsn = G_store(opt_dsn);
-    
-    return dsn;
-
-    /* OGR dsn and GRASS db connections are independent of each other */
-
     if (G_strncasecmp(opt_dsn, "PG:", 3) == 0) {
         /* PostgreSQL/PostGIS */
         size_t i;

Modified: grass/branches/releasebranch_7_6/vector/v.external/main.c
===================================================================
--- grass/branches/releasebranch_7_6/vector/v.external/main.c	2019-03-01 19:47:21 UTC (rev 74145)
+++ grass/branches/releasebranch_7_6/vector/v.external/main.c	2019-03-01 19:48:05 UTC (rev 74146)
@@ -101,12 +101,8 @@
     }
 
     dsn = NULL;
-    /* disabling GRASS-PostGIS driver:
-     *  TODO: a new fn that converts OGR dsn to PQ connection info,
-     *   ignoring current GRASS db connection */
-    use_ogr = TRUE;
     if (options.dsn->answer)
-        dsn = G_store(options.dsn->answer);
+        dsn = get_datasource_name(options.dsn->answer, use_ogr);
     
     if (flags.list->answer || flags.tlist->answer) {
         /* list layers */