expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-15 13:27:11 +00:00
Code Issues 18 Projects 3 Activity

many bugs fixed

Browse Source
This commit is contained in:
Philip Sargent
2025-02-02 03:10:10 +00:00
parent 3003b3c3c3
commit f39e2c9bb5
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/views/cave_kataster.py
View File

@@ -77,12 +77,21 @@ def kataster(request, slug):
mvscript += f'sed -i {sed_cmd} {ent}.html\n'
mvscript += f'sed -i {sed_cmd} {pt_target}\n'
# 2024-DM-01 has no tag_ or other_station, but does have a *fix, cited in the survex file, catch this case:
fix = (cave.unofficial_number)
new = fix.replace(cave.unofficial_number,str(knum))
sed_cmd = f"s/{fix}/{new}/g".replace(".","\.")
mvscript += f'sed -i "{sed_cmd}" {pt_target}\n'
entrance_data = []
for ent in ent_dir.iterdir():
if str(ent.name).startswith(str(cave)):
print(ent.name)
entrance_data.append("entrance_data/"+ent.name)
# entrance_ids.append(ent.name.replace(".html",""))
mvscript += f'sed -i "/<slug>{str(cave)}/d" {ent.name}\n'
mvscript += f'sed -i "/href=\|src=/s/\/{cave.areacode}\/{cave.unofficial_number}\//\/{cave.areacode}\/{knum}\//g" {ent.name}\n'
mvscript += f"mv {ent.name} {ent.name.replace(str(cave.unofficial_number),str(knum))}\n"
mvscript += f"\ncd {get_cd(settings.CAVEDESCRIPTIONS)}\n"
@@ -101,6 +110,11 @@ def kataster(request, slug):
mvscript += f"mv {cavefilename} {target}.html\n\n"
mvscript += f"cd {get_cd(settings.EXPOWEB / cave.areacode / cave.unofficial_number)}\n"
mvscript += f'sed -i "/href=\|src=/s/\/{cave.areacode}\/{cave.unofficial_number}\//\/{cave.areacode}\/{knum}\//g" *.html\n'
mvscript += f'sed -i "/href=\|src=/s/\/{cave.areacode}\/{cave.unofficial_number}\//\/{cave.areacode}\/{knum}\//g" */*.html\n\n'
mvscript += f"cd {get_cd(settings.EXPOWEB / cave.areacode)}\n"
mvscript += f"mv {cave.unofficial_number} {knum}\n\n"
loser_data = []
@@ -126,18 +140,23 @@ def kataster(request, slug):
l_script += f'sed -i "/^*begin/s/{survex_name}/{knum}/" {loser_name}/{survex_name}.svx\n'
l_script += f'sed -i "/^*end/s/{survex_name}/{knum}/" {loser_name}/{survex_name}.svx\n'
l_script +=f"# These 'sed' edits will not do everything in all cases, but they do the basics\n\n"
l_script +=f"mv {loser_name} {target}\n"
l_script +=f"cd {target}\n"
area_dir = get_cd(settings.SURVEX_DATA / f"caves-{cave.areacode}")
l_script +=f"cd {area_dir}\n"
l_script +=f"mv {cave.unofficial_number} {knum}\n"
l_script +=f"cd {knum}\n"
for filename in loser_data:
l_script +=f"mv {filename} {filename.replace(survex_name,str(knum))}\n"
l_script +=f"# But note that git ignores .log and .3d files\n\n"
error = ""
for dir in [(settings.SURVEX_DATA / f"caves-{cave.areacode}" / str(knum)), (settings.EXPOWEB / cave.areacode / str(knum))]:
if dir.is_dir():
error += f"STOP: a target directory exists. REMOVE or RENAME it first: {dir}<br>\n"
# 1623 : fixedpts/gps/gps23.svx:26:*fix p2023-mg-03 reference 13.81514 47.69169 1767
# 1626: fixedpts/1626-no-schoenberg-hs-not-tied-to-caves.svx
return l_script
return l_script, error
knum = 9999
@@ -172,7 +191,7 @@ def kataster(request, slug):
print(msg)
raise
except Exception as e:
msg=f"CANNOT write this file {filepath}. Ask a nerd to fix this: {e}"
msg=f"CANNOT write this file {f}. Ask a nerd to fix this: {e}"
print(msg)
# Restart script with POST data
@@ -198,7 +217,8 @@ def kataster(request, slug):
form = KatasterForm()
script += do_file_finding(knum)
script += script_loser(knum)
scr, error = script_loser(knum)
script += scr
alias = f'(\\"{cave.slug()}\\", \\"{cave.areacode}-{knum}\\"),'
aliasfile = settings.CAVEDESCRIPTIONS / "cavealiases.txt"
@@ -214,7 +234,7 @@ def kataster(request, slug):
request,
"cave_kataster.html",
{
"form": form, "warning": warning,
"form": form, "warning": warning, "error": error,
"cave": cave, "entrances": entrances,
"cave_data": cave_data, "entrance_data": entrance_data,
"loser_name": loser_name, "loser_data": loser_data,

6
templates/cave_kataster.html
View File

@@ -27,7 +27,8 @@ This cave needs to be "katastered". If you have the new number issued by the Aus
{% endif %}
<div style="color:red; font-weight: bold; font-size: large">
{{warning|safe}}</div>
{{warning|safe}}<p>
{{error|safe}}</div>
<h3>Rename the .html files in <var>expoweb</var></h3>
<div style="font-family: monospace; font-weight: bold;">
@@ -190,4 +191,7 @@ OR we can do an online rename of the "Cave" object in the database [code yet to
See what the edits look like &rarr;
</button>
</form>
<div style="color:red; font-weight: bold; font-size: large">
{{warning|safe}}<p>
{{error|safe}}</div>
{% endblock %}