diff options
| -rw-r--r-- | parsers/caves.py | 5 | ||||
| -rw-r--r-- | templates/dataformat/cave.xml | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/parsers/caves.py b/parsers/caves.py index f4bcf84..e7eebb4 100644 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -119,7 +119,7 @@ def create_new_cave(svxpath, msg=None): # double check if a[0:3] == "162": areacode = a[0:4] - url = f"{areacode}/{caveid}.html" # Note we are appending the .html as we are believe in backwards compatability. + url = f"{areacode}/{caveid}.html" # Note we are appending the .html as we are believe in backwards compatability. This is to fix Martin's new 2023 app. else: print(f"WARNING: parsers/caves/create_new_cave called with svxpath '{svxpath}'. Surely it should start 'caves-162*'? {msg}") areacode = "1623" @@ -228,7 +228,8 @@ def do_pending_cave(slug, caveid, url, areacode, msg=None): def get_survex_file(k): """Guesses at and finds a survex file for this pending cave. - Convoluted. Needs rewriting + Convoluted. Needs rewriting. + Pointless if this cave is being created because we found a survex file... """ if k[0:3] == "162": id = Path(k[5:]) diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml index e7f12e6..3f132c3 100644 --- a/templates/dataformat/cave.xml +++ b/templates/dataformat/cave.xml @@ -45,7 +45,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast </entrance> {% endfor %} <explorers>{{ cave.explorers|default_if_none:""|safe }}</explorers><!-- 'CUCC Expo' and year(s) of exploration. To distinguish from caves explored by foreign groups. Individual names can be given too if it was a small cave. --> -<survex_file>{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves/cavenum/cavnum.svx". (e.g. caves/204/204.svx --> +<survex_file>{{ cave.survex_file|default_if_none:"caves-1623/000/000.svx"|safe }}</survex_file><!-- Name of top-level survey file for this cave. Relative to the 'loser' survex repository. So for most caves that's "caves-162x/cavenum/cavnum.svx". (e.g. caves-1623/204/204.svx --> <underground_description>{{ cave.underground_description|default_if_none:""|safe }}</underground_description><!-- Underground description. (description of approach and entrance goes in entrance file). For a small cave this will be the entire description. For larger caves it will be the front page of the description, or a short intro, containing links to other pages with the cave description in, or even nothing but a link. --> <equipment>{{ cave.equipment|default_if_none:""|safe }}</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. --> <references>{{ cave.references|default_if_none:""|safe }}</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. --> |