Просмотр исходного кода

v.out.postgis: fix epsg vs. srid check
(merge https://trac.osgeo.org/grass/changeset/69612 from relbr72)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@69613 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 8 лет назад
Родитель
Сommit
27cc023c8a
1 измененных файлов с 7 добавлено и 4 удалено
  1. 7 4
      vector/v.out.postgis/create.c

+ 7 - 4
vector/v.out.postgis/create.c

@@ -69,10 +69,13 @@ char *create_pgfile(const char *dsn, const char *schema, const char *olink,
 	    G_debug(1, "option: %s=%s", tokens[0], tokens[1]);
             /* force lower case */
             G_str_to_lower(tokens[0]);
-
-            if (strcmp(tokens[0], "srid") && epsg)
-                G_warning(_("EPSG code (%s) defined for current location will be ignored"),
-                          epsg);
+            /* strip whitespace for key/value */
+            G_strip(tokens[0]);
+            G_strip(tokens[1]);
+            
+            if (strcmp(tokens[0], "srid") == 0 && (epsg && strcmp(tokens[1], epsg) != 0))
+                G_warning(_("EPSG code defined for current location (%s) is overridden by %s"),
+                          epsg, tokens[1]);
             
 	    G_set_key_value(tokens[0], tokens[1], key_val);