Browse Source

v.in.ogr/v.external: OGR dsn and GRASS db connections are independent of each other

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@72979 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 6 years ago
parent
commit
b3eabc3ea7
3 changed files with 8 additions and 2 deletions
  1. 6 0
      vector/v.external/dsn.c
  2. 1 1
      vector/v.external/main.c
  3. 1 1
      vector/v.in.ogr/main.c

+ 6 - 0
vector/v.external/dsn.c

@@ -8,6 +8,12 @@ char *get_datasource_name(const char *opt_dsn, int use_ogr)
 {
     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;

+ 1 - 1
vector/v.external/main.c

@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 
     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 */

+ 1 - 1
vector/v.in.ogr/main.c

@@ -456,7 +456,7 @@ int main(int argc, char *argv[])
 
     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);