From d990978673c2bae0d40abb1e43f409bbcd13ebb0 Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Thu, 10 Jan 2019 03:16:11 -0500 Subject: [PATCH 1/4] highwaydatastats.log: sort by region within system --- siteupdate/python-teresco/siteupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 85f4ab54..8cf5d4d8 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2615,7 +2615,7 @@ def run(self): + ' mi\n') if len(h.mileage_by_region) > 1: hdstatsfile.write("System " + h.systemname + " by region:\n") - for region in list(h.mileage_by_region.keys()): + for region in sorted(h.mileage_by_region.keys()): hdstatsfile.write(region + ": " + "{0:.2f}".format(h.mileage_by_region[region]) + " mi\n") hdstatsfile.write("System " + h.systemname + " by route:\n") for cr in h.con_route_list: From 859d92bc704d625fd8e90312cc0ac1281927ae73 Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Thu, 10 Jan 2019 04:15:33 -0500 Subject: [PATCH 2/4] single quotes in ConnectedRoute.groupname --- siteupdate/python-teresco/siteupdate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 8cf5d4d8..e9af6c6a 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -878,7 +878,7 @@ def __init__(self,line,system,el): el.add_error("System mismatch parsing line [" + line + "], expected " + system.systemname) self.route = fields[1] self.banner = fields[2] - self.groupname = fields[3].replace("'","''") + self.groupname = fields[3] # fields[4] is the list of roots, which will become a python list # of Route objects already in the system self.roots = [] @@ -905,7 +905,7 @@ def __init__(self,line,system,el): def csv_line(self): """return csv line to insert into a table""" - return "'" + self.system.systemname + "','" + self.route + "','" + self.banner + "','" + self.groupname + "','" + self.roots[0].root + "','" + str(self.mileage) + "'"; + return "'" + self.system.systemname + "','" + self.route + "','" + self.banner + "','" + self.groupname.replace("'","''") + "','" + self.roots[0].root + "','" + str(self.mileage) + "'"; def readable_name(self): """return a string for a human-readable connected route name""" From a2839088de98e518a8c7b75bc0a595bbf5f7387f Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Fri, 11 Jan 2019 02:16:33 -0500 Subject: [PATCH 3/4] user logs: sort Overall-by-region stats --- siteupdate/python-teresco/siteupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index e9af6c6a..2e53adf2 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2651,7 +2651,7 @@ def run(self): t.log_entries.append("Overall in active+preview systems: " + format_clinched_mi(t_active_preview_miles,active_preview_miles)) t.log_entries.append("Overall by region: (each line reports active only then active+preview)") - for region in list(t.active_preview_mileage_by_region.keys()): + for region in sorted(t.active_preview_mileage_by_region.keys()): t_active_miles = 0.0 total_active_miles = 0.0 if region in list(t.active_only_mileage_by_region.keys()): From 0687fd62302109b2e2fd5d61c254e425779d85fa Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Fri, 11 Jan 2019 03:22:12 -0500 Subject: [PATCH 4/4] user logs: sort system-by-region stats --- siteupdate/python-teresco/siteupdate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index 2e53adf2..9ec00d5f 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2709,7 +2709,7 @@ def run(self): if t_system_overall > 0.0: if len(h.mileage_by_region) > 1: t.log_entries.append("System " + h.systemname + " by region:") - for region in list(h.mileage_by_region.keys()): + for region in sorted(h.mileage_by_region.keys()): system_region_mileage = 0.0 if h.systemname in t.system_region_mileages and region in t.system_region_mileages[h.systemname]: system_region_mileage = t.system_region_mileages[h.systemname][region]