Skip to content

stats log enhancements#166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jteresco merged 4 commits into from
Jan 11, 2019
Merged

stats log enhancements #166

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d990978
highwaydatastats.log: sort by region within system
yakra Jan 10, 2019
859d92b
single quotes in ConnectedRoute.groupname
yakra Jan 10, 2019
a283908
user logs: sort Overall-by-region stats
yakra Jan 11, 2019
0687fd6
user logs: sort system-by-region stats
yakra Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions siteupdate/python-teresco/siteupdate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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 = []
Expand All@@ -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"""
Expand DownExpand Up@@ -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:
Expand DownExpand Up@@ -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()):
Expand DownExpand Up@@ -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]
Expand Down