[GRASS-SVN] r72979 - in grass/trunk/vector: v.external v.in.ogr

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-07-12 05:39:37 -0700 (Thu, 12 Jul 2018)
New Revision: 72979

Modified:
   grass/trunk/vector/v.external/dsn.c
   grass/trunk/vector/v.external/main.c
   grass/trunk/vector/v.in.ogr/main.c
Log:
v.in.ogr/v.external: OGR dsn and GRASS db connections are independent of each other

Modified: grass/trunk/vector/v.external/dsn.c
===================================================================
--- grass/trunk/vector/v.external/dsn.c	2018-07-11 08:49:23 UTC (rev 72978)
+++ grass/trunk/vector/v.external/dsn.c	2018-07-12 12:39:37 UTC (rev 72979)
@@ -8,6 +8,12 @@
 {
     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/trunk/vector/v.external/main.c
===================================================================
--- grass/trunk/vector/v.external/main.c	2018-07-11 08:49:23 UTC (rev 72978)
+++ grass/trunk/vector/v.external/main.c	2018-07-12 12:39:37 UTC (rev 72979)
@@ -102,7 +102,7 @@
 
     dsn = NULL;
     if (options.dsn->answer)
-        dsn = get_datasource_name(options.dsn->answer, use_ogr);
+        dsn = G_store(options.dsn->answer);
     
     if (flags.list->answer || flags.tlist->answer) {
         /* list layers */

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2018-07-11 08:49:23 UTC (rev 72978)
+++ grass/trunk/vector/v.in.ogr/main.c	2018-07-12 12:39:37 UTC (rev 72979)
@@ -456,7 +456,7 @@
 
     dsn = NULL;
     if (param.dsn->answer)
-        dsn = get_datasource_name(param.dsn->answer, TRUE);
+        dsn = G_store(param.dsn->answer);
     
     min_area = atof(param.min_area->answer);
     snap = atof(param.snap->answer);