diff --git a/parsers/locations.py b/parsers/locations.py index 568e79b84..4c23b4c6f 100644 --- a/parsers/locations.py +++ b/parsers/locations.py @@ -83,7 +83,7 @@ def validate_entrance_stations(ent=None): print(message) def validate_ent(ent): - """For each of the three tag strings in an Entrance object, + """For each of the two station strings in an Entrance object, validate each string as referring to a valid SurvexStation object. But our list of created SurvexStation objects is created by taking a list of strings and using them to select from lines in a .pos file - so this is unnecessarily indirect. @@ -97,10 +97,10 @@ def validate_entrance_stations(ent=None): cave = cavelist[0] url = f"/{cave.url}" elif len(cavelist) > 1: - cave = cavelist[-1] + cave = cavelist[-1] # set to last in list url = f"/{cave.url}" else: - print(f"BUGGER {ent} {ent.cavelist()}") + print(f"BUGGER bad cave '{cavelist}' on Entrance object {ent} ") url="/caves" for st, ent_type in {ent.other_station: "other", ent.tag_station: "tag"}.items(): if st == "": diff --git a/templates/editentrance.html b/templates/editentrance.html index c07235d1c..2691d6e7b 100644 --- a/templates/editentrance.html +++ b/templates/editentrance.html @@ -9,11 +9,25 @@ {% include 'html_editor_pop_ups.html' %}