Drop more non-ascii dashes, update regress tests (#1226) [RT-SIGTA]

There's a still-failing regress test due to SRID 0 being considered != 1

git-svn-id: http://svn.osgeo.org/postgis/trunk@7934 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/topology/sql/sqlmm.sql b/topology/sql/sqlmm.sql
index da4d456b17cc8549861136fe1b6f700c4a49239e..d36a52e3579d6d8ac7ea7b566a6fe5ae1264f39d 100644 (file)
--- a/topology/sql/sqlmm.sql
+++ b/topology/sql/sqlmm.sql
@@ -196,7 +196,7 @@ BEGIN
       INTO STRICT e1rec;
     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        RAISE EXCEPTION 'SQL/MM Spatial exception – non-existent edge %', e1id;
+        RAISE EXCEPTION 'SQL/MM Spatial exception - non-existent edge %', e1id;
       WHEN INVALID_SCHEMA_NAME THEN
         RAISE EXCEPTION 'SQL/MM Spatial exception - invalid topology name';
       WHEN UNDEFINED_TABLE THEN
@@ -210,7 +210,7 @@ BEGIN
       INTO STRICT e2rec;
     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        RAISE EXCEPTION 'SQL/MM Spatial exception – non-existent edge %', e2id;
+        RAISE EXCEPTION 'SQL/MM Spatial exception - non-existent edge %', e2id;
     -- NOTE: checks for INVALID_SCHEMA_NAME or UNDEFINED_TABLE done before
   END;
 
@@ -237,7 +237,7 @@ BEGIN
     commonnode = e1rec.start_node;
     caseno = 4;
   ELSE
-    RAISE EXCEPTION 'SQL/MM Spatial exception – non-connected edges';
+    RAISE EXCEPTION 'SQL/MM Spatial exception - non-connected edges';
   END IF;
 
   -- Check if any other edge is connected to the common node
@@ -247,7 +247,7 @@ BEGIN
     || commonnode || ' OR end_node = ' || commonnode || ' )'
   LOOP
     RAISE EXCEPTION
-      'SQL/MM Spatial exception – other edges connected (ie: %)', rec.edge_id;
+      'SQL/MM Spatial exception - other edges connected (ie: %)', rec.edge_id;
   END LOOP;
 
   -- NOT IN THE SPECS:
@@ -474,7 +474,7 @@ BEGIN
       INTO STRICT e1rec;
     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        RAISE EXCEPTION 'SQL/MM Spatial exception – non-existent edge %', e1id;
+        RAISE EXCEPTION 'SQL/MM Spatial exception - non-existent edge %', e1id;
       WHEN INVALID_SCHEMA_NAME THEN
         RAISE EXCEPTION 'SQL/MM Spatial exception - invalid topology name';
       WHEN UNDEFINED_TABLE THEN
@@ -488,7 +488,7 @@ BEGIN
       INTO STRICT e2rec;
     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        RAISE EXCEPTION 'SQL/MM Spatial exception – non-existent edge %', e2id;
+        RAISE EXCEPTION 'SQL/MM Spatial exception - non-existent edge %', e2id;
     -- NOTE: checks for INVALID_SCHEMA_NAME or UNDEFINED_TABLE done before
   END;
 
@@ -515,7 +515,7 @@ BEGIN
     commonnode = e1rec.start_node;
     caseno = 4;
   ELSE
-    RAISE EXCEPTION 'SQL/MM Spatial exception – non-connected edges';
+    RAISE EXCEPTION 'SQL/MM Spatial exception - non-connected edges';
   END IF;
 
   -- Check if any other edge is connected to the common node
@@ -525,7 +525,7 @@ BEGIN
     || commonnode || ' OR end_node = ' || commonnode || ' )'
   LOOP
     RAISE EXCEPTION
-      'SQL/MM Spatial exception – other edges connected (ie: %)', rec.edge_id;
+      'SQL/MM Spatial exception - other edges connected (ie: %)', rec.edge_id;
   END LOOP;
 
   -- NOT IN THE SPECS:
@@ -1048,7 +1048,7 @@ BEGIN
       INTO STRICT e1rec;
     EXCEPTION
       WHEN NO_DATA_FOUND THEN
-        RAISE EXCEPTION 'SQL/MM Spatial exception – non-existent edge %', e1id;
+        RAISE EXCEPTION 'SQL/MM Spatial exception - non-existent edge %', e1id;
       WHEN INVALID_SCHEMA_NAME THEN
         RAISE EXCEPTION 'SQL/MM Spatial exception - invalid topology name';
       WHEN UNDEFINED_TABLE THEN

diff --git a/topology/test/regress/st_modedgeheal_expected b/topology/test/regress/st_modedgeheal_expected
index 4453388080d40de0deeec34d633eaa4920cd8980..c4f19564445125ede9250dfceac519fa8efb2673 100644 (file)
--- a/topology/test/regress/st_modedgeheal_expected
+++ b/topology/test/regress/st_modedgeheal_expected
@@ -8,8 +8,8 @@ ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
-ERROR:  SQL/MM Spatial exception – non-connected edges
-ERROR:  SQL/MM Spatial exception – other edges connected (ie: 19)
+ERROR:  SQL/MM Spatial exception - non-connected edges
+ERROR:  SQL/MM Spatial exception - other edges connected (ie: 19)
 ERROR:  Edge 2 is closed, cannot heal to edge 3
 ERROR:  Edge 2 is closed, cannot heal to edge 3
 ERROR:  Cannot heal edge 25 with itself, try with another
@@ -107,8 +107,8 @@ E1
 E2
 ERROR:  TopoGeom 1 in layer 1 (t.f.g) cannot be represented healing edges 1 and 2
 ERROR:  TopoGeom 1 in layer 1 (t.f.g) cannot be represented healing edges 2 and 1
-ERROR:  SQL/MM Spatial exception – non-existent edge 200
-ERROR:  SQL/MM Spatial exception – non-existent edge 100
+ERROR:  SQL/MM Spatial exception - non-existent edge 200
+ERROR:  SQL/MM Spatial exception - non-existent edge 100
 E3
 E4
 2|-4
@@ -116,7 +116,7 @@ E4
 3|4
 3|-3
 MH(3,4)|5
-ERROR:  SQL/MM Spatial exception – non-connected edges
+ERROR:  SQL/MM Spatial exception - non-connected edges
 2|3
 3|-3
 Topology 't' dropped

diff --git a/topology/test/regress/st_newedgeheal_expected b/topology/test/regress/st_newedgeheal_expected
index 63829b8ae536789fe26f82d553fa0beac882497c..6593547d72c6a6f5451d668d811a8341bffe4230 100644 (file)
--- a/topology/test/regress/st_newedgeheal_expected
+++ b/topology/test/regress/st_newedgeheal_expected
@@ -8,8 +8,8 @@ ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
-ERROR:  SQL/MM Spatial exception – non-connected edges
-ERROR:  SQL/MM Spatial exception – other edges connected (ie: 19)
+ERROR:  SQL/MM Spatial exception - non-connected edges
+ERROR:  SQL/MM Spatial exception - other edges connected (ie: 19)
 ERROR:  Edge 2 is closed, cannot heal to edge 3
 ERROR:  Edge 2 is closed, cannot heal to edge 3
 ERROR:  Cannot heal edge 25 with itself, try with another
@@ -107,8 +107,8 @@ E1
 E2
 ERROR:  TopoGeom 1 in layer 1 (t.f.g) cannot be represented healing edges 1 and 2
 ERROR:  TopoGeom 1 in layer 1 (t.f.g) cannot be represented healing edges 2 and 1
-ERROR:  SQL/MM Spatial exception – non-existent edge 200
-ERROR:  SQL/MM Spatial exception – non-existent edge 100
+ERROR:  SQL/MM Spatial exception - non-existent edge 200
+ERROR:  SQL/MM Spatial exception - non-existent edge 100
 E3
 E4
 2|-4
@@ -116,7 +116,7 @@ E4
 3|4
 3|-3
 MH(3,4)|5
-ERROR:  SQL/MM Spatial exception – non-connected edges
+ERROR:  SQL/MM Spatial exception - non-connected edges
 2|5
 3|-5
 Topology 't' dropped

diff --git a/topology/test/regress/st_remedgemodface_expected b/topology/test/regress/st_remedgemodface_expected
index ec0e0a79c3ca4c78be4c34e3c012f488cb3ec17f..69176c1e31c4c71b0c1f757a77c3fff6a0cc3db7 100644 (file)
--- a/topology/test/regress/st_remedgemodface_expected
+++ b/topology/test/regress/st_remedgemodface_expected
@@ -7,8 +7,8 @@ COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
-ERROR:  SQL/MM Spatial exception – non-existent edge 0
-ERROR:  SQL/MM Spatial exception – non-existent edge 143
+ERROR:  SQL/MM Spatial exception - non-existent edge 0
+ERROR:  SQL/MM Spatial exception - non-existent edge 143
 RM(25)|1
 RM(25)/nodes|+|21|1
 RM(25)/nodes|-|21|

diff --git a/topology/test/regress/st_remedgenewface_expected b/topology/test/regress/st_remedgenewface_expected
index 7da6e935e61cf12e890732f99ca63e427debac3d..0184a73684ec8fbcb27070e85fa3d8c4848cd746 100644 (file)
--- a/topology/test/regress/st_remedgenewface_expected
+++ b/topology/test/regress/st_remedgenewface_expected
@@ -7,8 +7,8 @@ COMMIT
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - null argument
 ERROR:  SQL/MM Spatial exception - invalid topology name
-ERROR:  SQL/MM Spatial exception – non-existent edge 0
-ERROR:  SQL/MM Spatial exception – non-existent edge 143
+ERROR:  SQL/MM Spatial exception - non-existent edge 0
+ERROR:  SQL/MM Spatial exception - non-existent edge 143
 RN(25)|
 RN(25)/nodes|+|21|1
 RN(25)/nodes|-|21|