expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 16:51:54 +00:00
Code Issues 19 Projects 3 Activity

comment updates

Browse Source
This commit is contained in:
Philip Sargent 2023-09-27 21:44:04 +03:00
parent 421b47c137
commit 7f9f598f11
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/models/caves.py
View File

@ -26,13 +26,13 @@ Gcave_count = None
todo = """ todo = """
- Find out why we have separate objects CaveSlug and why - Find out why we have separate objects CaveSlug and why
these are not just a single field on the Model. Do we ever need more these are not just a single field on the Model. This was Martin's idea,
than one slug per cave or entrance? Surely that would break everything?? but we are using text aliases now so we only need one slug in the data model
- Can we rewrite things to eliminate the CaveSlug and objects? Surely - Can we rewrite things to eliminate the CaveSlug and objects? Surely
foreign keys work fine ?! foreign keys work fine ?!
- Why do we have CaveAndEntrance objects ? Surely entranceletter belongs on the Entrance object? - Why do we have CaveAndEntrance objects ?
- move the aliases list from the code and put into an editable file - move the aliases list from the code and put into an editable file
@ -644,7 +644,6 @@ def GetCaveLookup():
("tempest", "1623-2023-lc-01"), ("tempest", "1623-2023-lc-01"),
("1623-2023-kt-02", "2023-kt-02"), ("1623-2023-kt-02", "2023-kt-02"),
#("1623-2023-jss-01", "2023-jss-01"),
# 1626 aliases # 1626 aliases
("langgustl", "1626-354"), ("langgustl", "1626-354"),
@ -691,6 +690,8 @@ def GetCaveLookup():
ldup = [] ldup = []
for d in duplicates: for d in duplicates:
# if an alias resolves to 2 or more caves, remove it as an alias
# NOTE such an alisas is restored, assuming a 1623 area, when parsing Wallets - but only wallets.
Gcavelookup.pop(d) Gcavelookup.pop(d)
Gcave_count.pop(d) # so should not get a duplicate msg below.. Gcave_count.pop(d) # so should not get a duplicate msg below..
ldup.append(d) ldup.append(d)

2
core/views/caves.py
View File

@ -32,8 +32,6 @@ Manages the use of cavern to parse survex files to produce 3d and pos files
""" """
todo = """ todo = """
- Fix rendercave() so that CaveView works
- in getCaves() search GCavelookup first, which should raise a MultpleObjectsReturned - in getCaves() search GCavelookup first, which should raise a MultpleObjectsReturned
exception if no duplicates exception if no duplicates

4
parsers/caves.py
View File

@ -181,10 +181,12 @@ def do_ARGE_cave(slug, caveid, areacode, svxid):
We already know the survex file. We already know the survex file.
We already know that the cave doesn't exist... though there are bugs.. We already know that the cave doesn't exist... though there are bugs..
Assumes anything in the ARGE list of cave areas is Arge, which is not true for 1626...
caveid may be kataster number or it may be e.g. LA34 caveid may be kataster number or it may be e.g. LA34
""" """
default_note = "This is an ARGE cave where we only have the survex file and no other information" default_note = "This is (probably) an ARGE cave where we only have the survex file and no other information"
url = f"{areacode}/{caveid}.html" url = f"{areacode}/{caveid}.html"
urltest = Cave.objects.filter(url=url) urltest = Cave.objects.filter(url=url)