expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-04 09:51:47 +01:00
Code Issues 18 Projects 3 Activity

bugfix and making more robust

Browse Source
This commit is contained in:
Philip Sargent 2023-11-05 15:20:45 +02:00
parent d524f94c47
commit 2c67351424
3 changed files with 50 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/forms.py
View File

@ -208,7 +208,9 @@ class EntranceLetterForm(ModelForm):
Nb. The relationship between caves and entrances has historically been a many to many relationship. Nb. The relationship between caves and entrances has historically been a many to many relationship.
With entrances gaining new caves and letters when caves are joined. With entrances gaining new caves and letters when caves are joined.
""" """
entranceletter = forms.CharField(required=False, widget=forms.TextInput(attrs={"size": "2"}))
# This only needs to be required=True for the second and subsequent entrances, not the first. Tricky.
entranceletter = forms.CharField(required=True, widget=forms.TextInput(attrs={"size": "2"}))
class Meta: class Meta:
model = CaveAndEntrance model = CaveAndEntrance

2
core/views/caves.py
View File

@ -519,7 +519,7 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
entranceletter = entletterform.cleaned_data["entranceletter"] entranceletter = entletterform.cleaned_data["entranceletter"]
else: else:
print(f"- POST INVALID {caveslug=} {entslug=} {path=} entletterform invalid.") print(f"- POST INVALID {caveslug=} {entslug=} {path=} entletterform invalid.")
return render(request, "errors/badslug.html", {"entletter problem in edit_entrances()"}) return render(request, "errors/badslug.html", {"badslug": "entletter problem in edit_entrances()"})
# if entform.is_valid() and entletterform.is_valid(): # if entform.is_valid() and entletterform.is_valid():
if entform.is_valid(): if entform.is_valid():
entrance = entform.save(commit=False) entrance = entform.save(commit=False)

12
parsers/locations.py
View File

@ -292,7 +292,7 @@ def LoadPositions():
print(message) print(message)
topdata = os.fspath(Path(settings.SURVEX_DATA) / settings.SURVEX_TOPNAME) topdata = os.fspath(Path(settings.SURVEX_DATA) / settings.SURVEX_TOPNAME)
print(f" - Generating a list of Pos from {topdata}.svx and then loading...") print(f" - Generating a list of Pos from {topdata}.3d and then loading...")
found = 0 found = 0
print("\n") # extra line because cavern overwrites the text buffer somehow print("\n") # extra line because cavern overwrites the text buffer somehow
@ -341,8 +341,7 @@ def LoadPositions():
stash_data_issue(parser="positions", message=message, url=f"/entrance_data/{pospath}_edit") stash_data_issue(parser="positions", message=message, url=f"/entrance_data/{pospath}_edit")
print(message) print(message)
return return
with open(pospath) as posfile:
posfile = open(pospath)
posfile.readline() # Drop header posfile.readline() # Drop header
sbdict = {} sbdict = {}
@ -392,11 +391,4 @@ def LoadPositions():
if dups > 0: if dups > 0:
print(f" - {dups} Duplicated SurvexStation entrances found") print(f" - {dups} Duplicated SurvexStation entrances found")
# for p in mappoints:
# if p not in found_points:
# print(f"Valid point {p} NOT found in {positions_filename}")
# print(f" - {len(mappoints)} mappoints, {len(found_points)} found_points")
# for sid in found_points:
# if found_points[sid] > 1:
# print(f" - {sid} - {found_points[sid]}")
store_data_issues() store_data_issues()