From 5cd921b6cea5bf072da80b6736863b93b4e6c5a0 Mon Sep 17 00:00:00 2001 From: eric bryant Date: Sat, 19 Dec 2020 20:57:11 -0500 Subject: [PATCH 1/2] unconnected chopped route bugfix for #389 --- siteupdate/python-teresco/siteupdate.py | 1 + 1 file changed, 1 insertion(+) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 5dece2de..c4c3e806 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2937,6 +2937,7 @@ def run(self): # check for unconnected chopped routes if r.con_route is None: el.add_error(r.system.systemname + ".csv: root " + r.root + " not matched by any connected route root.") + continue # check for mismatched route endpoints within connected routes q = r.con_route.roots[r.rootOrder-1] From f6d6bfacb6e4bf3527e22a9b889c7f4496c87eb8 Mon Sep 17 00:00:00 2001 From: eric bryant Date: Sat, 19 Dec 2020 21:19:30 -0500 Subject: [PATCH 2/2] no label hashes for unconnected chopped routes keep output identical to Python version --- siteupdate/cplusplus/siteupdate.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/siteupdate/cplusplus/siteupdate.cpp b/siteupdate/cplusplus/siteupdate.cpp index 756743c1..9f4163b3 100644 --- a/siteupdate/cplusplus/siteupdate.cpp +++ b/siteupdate/cplusplus/siteupdate.cpp @@ -394,7 +394,9 @@ int main(int argc, char *argv[]) for (Route& r : h->route_list) { // check for unconnected chopped routes if (!r.con_route) - el.add_error(r.system->systemname + ".csv: root " + r.root + " not matched by any connected route root."); + { el.add_error(r.system->systemname + ".csv: root " + r.root + " not matched by any connected route root."); + continue; + } // check for mismatched route endpoints within connected routes #define q r.con_route->roots[r.rootOrder-1]