From 02c024ec726ac22caa0fe1555811b5f5feee0b28 Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Tue, 13 Nov 2018 16:06:14 -0500 Subject: [PATCH 1/3] order pointsinuse.log asciibetically --- 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 a3583509..183b1616 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2317,7 +2317,7 @@ def run(self): for r in h.route_list: if len(r.labels_in_use) > 0: inusefile.write(r.root + "(" + str(len(r.point_list)) + "):") - for label in r.labels_in_use: + for label in sorted(r.labels_in_use): inusefile.write(" " + label) inusefile.write("\n") inusefile.close() From 871eea22f9dab832f551a9500cd76debcf222f12 Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Tue, 13 Nov 2018 16:30:26 -0500 Subject: [PATCH 2/3] order unusedaltlabels.log asciibetically --- 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 183b1616..ddb534cf 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2332,7 +2332,7 @@ def run(self): if len(r.unused_alt_labels) > 0: total_unused_alt_labels += len(r.unused_alt_labels) unusedfile.write(r.root + "(" + str(len(r.unused_alt_labels)) + "):") - for label in r.unused_alt_labels: + for label in sorted(r.unused_alt_labels): unusedfile.write(" " + label) unusedfile.write("\n") unusedfile.write("Total: " + str(total_unused_alt_labels) + "\n") From 2193baf077eb95885bc41f171684b8d6ae8de85d Mon Sep 17 00:00:00 2001 From: Eric Bryant Date: Tue, 13 Nov 2018 17:19:58 -0500 Subject: [PATCH 3/3] delete labels_in_use & unused_alt_labels when done saves a tiny little bit of RAM --- siteupdate/python-teresco/siteupdate.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/siteupdate/python-teresco/siteupdate.py b/siteupdate/python-teresco/siteupdate.py index ddb534cf..1d21e8e2 100755 --- a/siteupdate/python-teresco/siteupdate.py +++ b/siteupdate/python-teresco/siteupdate.py @@ -2320,6 +2320,7 @@ def run(self): for label in sorted(r.labels_in_use): inusefile.write(" " + label) inusefile.write("\n") + r.labels_in_use = None inusefile.close() # write log file for alt labels not in use @@ -2335,6 +2336,7 @@ def run(self): for label in sorted(r.unused_alt_labels): unusedfile.write(" " + label) unusedfile.write("\n") + r.unused_alt_labels = None unusedfile.write("Total: " + str(total_unused_alt_labels) + "\n") unusedfile.close()