Merge branch 'expoweb' of ssh://expo.survex.com/home/expo/expoweb into expoweb

cave data duplicate kataster fix
This commit is contained in:
Philip Sargent 2020-06-08 19:18:22 +01:00
commit f59c742512
7 changed files with 17 additions and 15 deletions

View File

Before

Width:  |  Height:  |  Size: 171 KiB

After

Width:  |  Height:  |  Size: 171 KiB

View File

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

View File

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -9,12 +9,12 @@
<cave>
<non_public>False</non_public>
<caveslug>1623-106</caveslug>
<official_name>Eislufthohle</official_name>
<official_name>Eislufth&ouml;hle</official_name>
<area>1623</area>
<area>1d</area>
<kataster_code>5/S/E x</kataster_code>
<kataster_number>76</kataster_number>
<unofficial_number>106</unofficial_number>
<kataster_code></kataster_code>
<kataster_number>106</kataster_number>
<unofficial_number>Numbering cock-up for 76</unofficial_number>
<entrance>
<entranceslug>1623-106</entranceslug>
@ -22,19 +22,21 @@
</entrance>
<explorers></explorers>
<underground_description>See 76 entry for information</underground_description>
<underground_description></underground_description>
<equipment></equipment>
<references></references>
<survey></survey>
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line>
<notes></notes>
<notes>106 was a mistake - the number was accidentally used by CUCC
for <a href="../76/76.htm">Eislufth&ouml;hle (76)</a> for a while. But we reverted to the
Austrian Kataster numbering once the confusion was discovered. So 106 and 76 are two numbers for the same cave.</notes>
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<description_file></description_file>
<url>1623/76/76.html</url>
<url>1623/106/index.htm</url>
</cave>
</body>
</html>

View File

@ -8,16 +8,16 @@
<body>
<cave>
<non_public>False</non_public>
<caveslug>1623-2004-01</caveslug>
<caveslug>1623-269</caveslug>
<official_name>Maraehöhle</official_name>
<area>1623</area>
<area>1d</area>
<kataster_code>1/T =</kataster_code>
<kataster_number></kataster_number>
<kataster_number>269</kataster_number>
<unofficial_number>2004-01</unofficial_number>
<entrance>
<entranceslug>1623-2004-01</entranceslug>
<entranceslug>1623-269</entranceslug>
<letter></letter>
</entrance>
@ -25,8 +25,8 @@
<underground_description>Chossy slope heading down hill, with snow plug below skylight. Cold air wells up through floor, presumably through fractures from 99. </underground_description>
<equipment>None</equipment>
<references>Email 2005-05-30</references>
<survey><p><a href="../../expofiles/surveys/2004-01/2004-01-plan-2015.pdf">2015 Plan<br /></a></p>
<p><a href="../../expofiles/surveys/2004-01/2004-01-elv-2015.pdf">2015 Elevation<br
<survey><p><a href="../../expofiles/surveys/269/2004-01-plan-2015.pdf">2015 Plan<br /></a></p>
<p><a href="../../expofiles/surveys/269/2004-01-elv-2015.pdf">2015 Elevation<br
/></a></p></survey>
<kataster_status></kataster_status>
<underground_centre_line></underground_centre_line>
@ -34,9 +34,9 @@
<length>14m</length>
<depth>5m</depth>
<extent></extent>
<survex_file>caves-1623/2004-01/2004-01.svx</survex_file>
<survex_file>caves-1623/269/269.svx</survex_file>
<description_file></description_file>
<url>1623/2004-01/index.html</url>
<url>1623/269/index.html</url>
</cave>
</body>
</html>

View File

@ -8,7 +8,7 @@
<body>
<entrance>
<non_public>False</non_public>
<slug>1623-2004-01</slug>
<slug>1623-269</slug>
<name></name>
<entrance_description>Large entrance facing towards ridge (with smaller skylight entrance near 99)</entrance_description>
<explorers></explorers>