[GRASS-SVN] r72976 - grass/branches/releasebranch_7_4/vector/v.out.ogr

[svn_grass at osgeo.org]

Author: mmetz
Date: 2018-07-11 01:36:19 -0700 (Wed, 11 Jul 2018)
New Revision: 72976

Modified:
   grass/branches/releasebranch_7_4/vector/v.out.ogr/dsn.c
   grass/branches/releasebranch_7_4/vector/v.out.ogr/main.c
Log:
v.out.ogr: do not modify OGR dsn (backport trunk r72975)

Modified: grass/branches/releasebranch_7_4/vector/v.out.ogr/dsn.c
===================================================================
--- grass/branches/releasebranch_7_4/vector/v.out.ogr/dsn.c	2018-07-11 08:34:31 UTC (rev 72975)
+++ grass/branches/releasebranch_7_4/vector/v.out.ogr/dsn.c	2018-07-11 08:36:19 UTC (rev 72976)
@@ -7,7 +7,13 @@
 char *get_datasource_name(const char *opt_dsn, int use_ogr)
 {
     char *dsn;
+
+    dsn = G_store(opt_dsn);
     
+    return dsn;
+
+    /* input OGR dsn and GRASS db connections are independent of each other */
+    /* TODO: remove below code */
     if (G_strncasecmp(opt_dsn, "PG:", 3) == 0) {
         /* PostgreSQL/PostGIS */
         size_t i;

Modified: grass/branches/releasebranch_7_4/vector/v.out.ogr/main.c
===================================================================
--- grass/branches/releasebranch_7_4/vector/v.out.ogr/main.c	2018-07-11 08:34:31 UTC (rev 72975)
+++ grass/branches/releasebranch_7_4/vector/v.out.ogr/main.c	2018-07-11 08:36:19 UTC (rev 72976)
@@ -277,7 +277,7 @@
 
     dsn = NULL;
     if (options.dsn->answer)
-        dsn = get_datasource_name(options.dsn->answer, TRUE);
+        dsn = G_store(options.dsn->answer);
 
     /* create new OGR layer in datasource */
     if (flags.new->answer) {