expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-22 07:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

2012-OW-01 and 2015-DL-01,02

Browse Source
This commit is contained in:
Philip Sargent 2023-10-15 17:14:18 +03:00
parent 657f8322b9
commit 3008a41b1f
6 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cave_data/1623-2012-OW-01.html
View File

@ -1,18 +1,25 @@
<!DOCTYPE html>
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Oct. 15, 2023, 2:21 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Oct. 15, 2023, 2:21 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
<cave>
<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
<caveslug>1623-2012-OW-01</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' -->
<official_name>Birth Control Chamber</official_name><!-- Name of the cave (normally in German) Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
<area>1623</area><!-- e.g. "1623" -->
<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
@ -33,21 +40,23 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1623-2012-OW-01</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1623-2012-OW-01+1623-2012-OW-01 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
<explorers>CUCC, Ollie, Frank</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. -->
<underground_description></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. -->
<survex_file></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>"requires new born baby to complete birth canal through trip 0.3m diameter"</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></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>2012#18</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<references><a href="/walletedit/2012:18">2012#18</a></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
<notes>Never typed up into survex file</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<notes>Survey exists, sketches exist. Never typed up into survex file</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<extent></extent>
<survex_file></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 -->
<description_file></description_file><!-- Path of top-level description file for this cave, when a separate file is used. Otherwise blank. -->
<url>1623/2012-OW-01</url><!-- (Required). Relative URL of this cave. i.e the URL this cave appears at on the website, not including 'https://expo.survex.com/. Normally area/cavenum., e.g ('1623/000')-->
</cave>

13
cave_data/1623-2015-dl-01.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- This file is generated by troggle on Sept. 11, 2023, 4:05 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Oct. 15, 2023, 3 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Sept. 11, 2023, 4:05 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Oct. 15, 2023, 3 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@ -46,10 +46,13 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<explorers>Dan Lenartowicz
Matt Watson</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>caves-1623/2015-dl-01/1.svx</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 -->
<underground_description>p7 leads into chossy rift, small crawl that would need digging. No other ways on.</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. -->
<survex_file>caves-1623/2015-dl-01/1.svx</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>p7 leads into chossy rift, small crawl that would need digging. No other ways on.
<img width=30% src="/expofiles/surveyscans/2015/2015%2316/notes.jpg"></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>2 Hangers, 2 slings, 20m Rope</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></references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<references>Presumably on the same trip that found 2015-dl-02, near organhohle too <a href="logbookentry/2015-07-16/2015-07-16a">2015-07-16a</a>
2015#16,
2017#54,55,56</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->

15
cave_data/1623-2015-dl-02.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<!-- This file is generated by troggle on May 8, 2023, 10:59 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- This file is generated by troggle on Oct. 15, 2023, 3 p.m. UTC using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this 1623-nnn.html file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
@ -10,7 +10,7 @@ though, you do not need to do a data import as it happens automatically -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on May 8, 2023, 10:59 p.m. UTC using the form documented at
<b>This file is generated by troggle</b> on Oct. 15, 2023, 3 p.m. UTC using the form documented at
the form documented at
<a href="/handbook/survey/caveentry.html">handbook/survey/caveentry.html</a>
<br>
@ -19,7 +19,7 @@ the form documented at
<non_public>False</non_public><!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
<caveslug>1623-2015-DL-02</caveslug><!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' -->
<official_name>Chossy Death Slope H&ouml;hle</official_name><!-- Name of the cave (normally in German) Use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
<area>1623</area><!-- the CUCC-defined areas shown in http://expo.survex.com/areas.htm -->
<area>1623</area><!-- e.g. "1623" -->
<kataster_code></kataster_code><!-- 'length-or-depth/type exploration'
code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast.htm
@ -40,19 +40,22 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
<entrance>
<entranceslug>1623-2015-dl-02</entranceslug><!-- Internal ID to refer to each entrance instance in the entrance files (typically the same as that filename (e.g. 1623-161c). Matches the 'slug' field in the entrance file -->
<!-- DEBUG 1623-2015-DL-02+1623-2015-dl-02 'Z' == -->
<letter></letter><!--Leave blank for single-entrance cave. If there is more than one entrace then the letter needs to be given. Generally matches the entranceslug ID. -->
</entrance>
<explorers>Matt Watson
Dan Lenartowicz</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></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 -->
<underground_description>2m high 15m wide horizontal entrance 2-3m climb down leads to 25&deg; choss slope (V. loose!) after aprox 15m turns right around corner. Possible aven but not very promising. (QMC)</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. -->
<survex_file></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>2m high 15m wide horizontal entrance 2-3m climb down leads to 25&deg; choss slope (V. loose!) after aprox 15m turns right around corner. Possible aven but not very promising. (QMC)
<br>
<img width=30% src="/expofiles/surveyscans/2015/2015%2316/notes.jpg"></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></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>CUCC2015DL02</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
<survey></survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line><!-- 'In dataset' if it is in the survex dataset. Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
<notes></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<notes>Presumably on the same trip that found 2015-dl-01, near organhohle too <a href="logbookentry/2015-07-16/2015-07-16a">2015-07-16a</a></notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
<length></length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<depth></depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
<extent></extent>

33
entrance_data/1623-2012-OW-01.html
View File

@ -1,7 +1,9 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<!-- This file is generated by troggle on Oct. 15, 2023, 2:19 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
<!-- there is 1 required field: slug. The entrance will not appear without that. -->
@ -12,17 +14,21 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Oct. 15, 2023, 2:19 p.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>
<non_public>False</non_public>
<slug>1623-2012-OW-01</slug>
<slug>1623-2012-OW-01</slug> <!-- one entrance and one slug per entrance_data file -->
<name></name>
<entrance_description>See scanned notes, not typed up</entrance_description>
<entrance_description>3 entrances, see <a href="/surveyscans/2012/2012%2318/notes2.png">notes2</a></entrance_description>
<explorers></explorers>
<map_description></map_description>
<location_description>See scanned notes, not typed up</location_description>
<lastvisit></lastvisit>
<approach></approach>
<underground_description></underground_description>
<photo>See scanned notes, not moved or edited</photo>
<photo>See scanned notes, several phots of entrances</photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@ -32,22 +38,21 @@
S? = Spit (?),
U = Unmarked,
? = Unknown" -->
<marking>?</marking>
<marking_comment></marking_comment>
<marking>P</marking>
<marking_comment>purple nail varnish, no tag</marking_comment>
<!-- findability options: ? = To be confirmed ...,
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability></findability>
<findability>S</findability>
<findability_description></findability_description>
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<lat_wgs84></lat_wgs84>
<long_wgs84></long_wgs84>
<tag_station>1623.p2012-ow-01</tag_station>
<other_station></other_station>
<other_description>See scanned notes, not typed up</other_description>
<bearings>See scanned notes, not typed up</bearings>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>
</body>

26
entrance_data/1623-2015-dl-01.html
View File

@ -1,26 +1,37 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- If you edit this file, make sure you update the websites database -->
<!-- This file is generated by troggle on Oct. 15, 2023, 2:53 p.m. UTC using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, and manually upload it to the server using git,
make sure you update the database by doing a full data import. If you edit it using the online form
though, you do not need to do a data import as it happens automatically -->
<!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
<!-- there is 1 required field: slug. The entrance will not appear without that. -->
<!-- ALWAYS use &uuml; for u+Umlaut and &ouml; for o+umlaut eg H&ouml;hle for Hohle and Gl&uuml;ck for Gluck-->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<b>This file is generated by troggle</b> on Oct. 15, 2023, 2:53 p.m. UTC using the form documented at
<a href="/handbook/survey/ententry.html">handbook/survey/ententry.html</a>
<br>
<entrance>
<non_public>False</non_public>
<slug>1623-2015-dl-01</slug>
<slug>1623-2015-dl-01</slug> <!-- one entrance and one slug per entrance_data file -->
<name></name>
<entrance_description>7m shaft with stone bridge across top.
4x3m and 2x2m</entrance_description>
<explorers>Dan Lenartowicz
Matt Watson</explorers>
<explorers>Dan LenartowiczMatt Watson</explorers>
<map_description></map_description>
<location_description>On 2018-06-06 04:24 +0100, Wookey wrote:
Last week the GMH centreline work was completed and checked in, and the therionising progressed a bit and we eventually (with a lot of
email) got to the bottom of the 'is Shagged Spit/GutenMorgenHoehle the same cave' mystery. Thanks to all who contributed - it was hard work, but we got there.
(The answer is no, there are two entrances, originally believed to be the same cave, the upper (tagged, explored, described, unsurveyed, unlocated, unphotoed) one is SS and the lower (explored, surveyed, photoed, undescribed, located) one is GMH).</location_description>
<lastvisit></lastvisit>
<approach></approach>
<underground_description>p7 leads to chossy rift</underground_description>
<photo></photo>
@ -42,10 +53,9 @@ email) got to the bottom of the 'is Shagged Spit/GutenMorgenHoehle the same cave
<findability>?</findability>
<findability_description>GPS data available on Anthony Day's GPS</findability_description>
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<lat_wgs84></lat_wgs84>
<long_wgs84></long_wgs84>
<tag_station>1623.GMH</tag_station>
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>

5
years/2018/logbook.html
View File

@ -14,7 +14,7 @@ maintain half a dozen parser functions.
Sorry about all the crap that surrounds the image tags which has been imported along with the content
when UK Caving blogs have been parsed.
Exported on 2023-10-14 19:10 using either the control panel webpage or when editing a logbook entry online
Exported on 2023-10-15 15:10 using either the control panel webpage or when editing a logbook entry online
See troggle/code/views/other.py and core.models/logbooks.py writelogbook(year, filename)
-->
<body>
@ -232,7 +232,8 @@ Small passage in roof above pitch ledge to left continues 30m through narrow cra
<br />
<br /><br /><b>CUCC2018 DM07 -</b><br />
Jon's phone DD 47.69429N 13.80534E<br />
Large open shaft. In, down over snow plug 30m. 2 consecutive pitches. First 5m, 2nd unknown.
Large open shaft. In, down over snow plug 30m. 2 consecutive pitches. First 5m, 2nd unknown.<br />
[This is Homecoming 1623-359 now]
<div class="timeug">T/U: 0.0 hours</div>
<div class="editentry"><br /><a href="/logbookedit/2018-07-12b">Edit this entry</a><br /></div>