merge lots of server changes

This commit is contained in:
Wookey
2016-05-10 02:41:52 +01:00
31 changed files with 382 additions and 44 deletions

View File

@@ -9,10 +9,10 @@
<cave>
<non_public>False</non_public>
<caveslug>1623-2007-71</caveslug>
<official_name></official_name>
<official_name>Korokoro Höhle</official_name>
<area>1623</area>
<area>1d</area>
<kataster_code></kataster_code>
<kataster_code>2/T x</kataster_code>
<kataster_number></kataster_number>
<unofficial_number>2007-71</unofficial_number>
@@ -30,7 +30,7 @@
</entrance>
<explorers>CUCC 2007, 2015 (Jenny + Olly)</explorers>
<underground_description><p>Low drafty entrance at base of small cliff quickly becomes walking/stooping passage. On the right is a 1m climb down to an undescended pitch (07-01B), next to this is another way on which leads to another undescended pitch (07-02C) with a passage appearing to continue beyond. A few meters further along the main passage is 2007-71b, a skylight entrance (freeclimable). Continuing on leads to a small chamber and four way junction. The passage on the right soon chokes. The pasage on the left quickly becomes very small and can be followed to pop out on a ledge part way down a shakehole (2007-71c), there is a sound connection between a rift in the SE corner of this shakehole and 97. The main pitch in teh shakehole is unexplored (15-03C) The passage continuing straight on from the chamber is bigger and soon reaches a drop which can be traversed over (crawling sized passage continues beyond, 15-01B), the drop is initially free climbable, but then bells out (15-02B).</p></underground_description>
<underground_description><p>Low drafty entrance at base of small cliff quickly becomes walking/stooping passage. On the right is a 1m climb down to an undescended pitch (07-01B), next to this is another way on which leads to another undescended pitch (07-02C) with a passage appearing to continue beyond. A few metres further along the main passage is 2007-71b, a skylight entrance (free-climbable). Continuing on leads to a small chamber and four way junction. The passage on the right soon chokes. The passage on the left quickly becomes very small and can be followed to pop out on a ledge part way down a shakehole (2007-71c), there is a sound connection between a rift in the SE corner of this shakehole and 97. The main pitch in the shakehole is unexplored (15-03C). The passage continuing straight on from the chamber is bigger and soon reaches a drop which can be traversed over (crawling sized passage continues beyond, 15-01B), the drop is initially free-climbable, but then bells out (15-02B).</p></underground_description>
<equipment>None</equipment>
<references></references>
@@ -39,8 +39,8 @@
<kataster_status></kataster_status>
<underground_centre_line>In dataset</underground_centre_line>
<notes></notes>
<length></length>
<depth></depth>
<length>99m</length>
<depth>15m</depth>
<extent></extent>
<survex_file>caves/2007-71/2007-71.svx</survex_file>
<description_file>1623/2007-71.html</description_file>

View File

@@ -0,0 +1,42 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<!-- Only put one cave in this file -->
<!-- If you edit this file, make sure you update the website database -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<cave>
<non_public>False</non_public>
<caveslug>1623-2013-sw-01</caveslug>
<official_name>Unnamed</official_name>
<area>1623</area>
<area>1d</area>
<kataster_code></kataster_code>
<kataster_number></kataster_number>
<unofficial_number>2013-sw-01</unofficial_number>
<entrance>
<entranceslug>1623-2013-sw-01</entranceslug>
<letter>a</letter>
</entrance>
<explorers>CUCC 2013 (Stuart Walker)</explorers>
<underground_description></underground_description>
<equipment></equipment>
<references></references>
<survey></survey>
<kataster_status></kataster_status>
<underground_centre_line>In dataset</underground_centre_line>
<notes></notes>
<length></length>
<depth></depth>
<extent></extent>
<survex_file></survex_file>
<description_file>1623/2013-sw-01.html</description_file>
<url>1623/2013-sw-01.html</url>
</cave>
</body>
</html>

View File

@@ -10,13 +10,14 @@
<non_public>False</non_public>
<slug>1623-2007-70</slug>
<name></name>
<entrance_description></entrance_description>
<explorers></explorers>
<entrance_description>Shaft entrance very near 2007-71a.</entrance_description>
<explorers>CUCC: Olly Betts</explorers>
<map_description></map_description>
<location_description></location_description>
<location_description>Plateau</location_description>
<approach></approach>
<underground_description></underground_description>
<photo></photo>
<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2640.JPG"><img src="2007-70/IMG_2640_small.jpg"></a><a href="../expofiles/photos/2007/Olly/IMG_2641.JPG"><img src="2007-70/IMG_2641_small.jpg"></a></p>
<p>Photos &copy; Jenny Black 2007</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,

View File

@@ -16,7 +16,7 @@
<location_description>Plateau</location_description>
<approach>From 97</approach>
<underground_description></underground_description>
<photo></photo>
<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2645.JPG"><img src="2007-71/IMG_2645_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@@ -42,7 +42,7 @@
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
<url>1623/2007-71.html</url>
</entrance>
</body>
</html>

View File

@@ -16,7 +16,7 @@
<location_description>Plateau</location_description>
<approach>From 97 or 2007-71a</approach>
<underground_description></underground_description>
<photo></photo>
<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71b_20828661702_o.jpg"><img src="2007-71/jenny-bolting-at-2007-71b_20828661702_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@@ -42,7 +42,7 @@
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
<url>1623/2007-71.html</url>
</entrance>
</body>
</html>

View File

@@ -16,7 +16,7 @@
<location_description>Plateau</location_description>
<approach>From 97</approach>
<underground_description></underground_description>
<photo></photo>
<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-at-2007-71c_20651320329_o.jpg"><img src="2007-71/jenny-at-2007-71c_20651320329_small.jpg"></a></p><p>Photo &copy; Olly Betts 2015</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
@@ -42,7 +42,7 @@
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
<url>1623/2007-71.html</url>
</entrance>
</body>
</html>

View File

@@ -0,0 +1,49 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<!-- Only put one entrance in this file -->
<!-- If you edit this file, make sure you update the website database -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head>
<body>
<entrance>
<non_public>False</non_public>
<slug>1623-2013-sw-01</slug>
<name></name>
<entrance_description></entrance_description>
<explorers>CUCC: Stuart Walker</explorers>
<map_description></map_description>
<location_description></location_description>
<approach></approach>
<underground_description></underground_description>
<photo><p><a href="../expofiles/photos/2015/OllyJenny/jenny-having-placed-the-tag-for-13-sw-01_20762343201_o.jpg"><img src="2013-sw-01/jenny-having-placed-the-tag-for-13-sw-01_20762343201_small.jpg"></a></p>
<p>Photo &copy; Olly Betts 2015</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,
T? = Tag (?),
R = Retagged,
S = Spit,
S? = Spit (?),
U = Unmarked,
? = Unknown" -->
<marking>T</marking>
<marking_comment>Tagged by Jenny and Olly 25 July 2015</marking_comment>
<!-- findability options: ? = To be confirmed ...,
S = Surveyed,
L = Lost,
R = Refindable" -->
<findability>R</findability>
<findability_description>GPS</findability_description>
<alt></alt>
<northing></northing>
<easting></easting>
<tag_station></tag_station>
<exact_station></exact_station>
<other_station></other_station>
<other_description></other_description>
<bearings></bearings>
<url></url>
</entrance>
</body>
</html>

View File

@@ -16,7 +16,7 @@
<location_description>Plateau, 200m north of <a href="82.htm">Br&auml;uningh&ouml;hle</a> (Kat. 82). This is not very obvious, since it is in an area of dwarf pine on a knoll south of the dry valley containing <a href="107.htm">Kat. 107</a>. However, the path to 204 (or at least the 2007 variant) passes about 10m from the entrance - going up the hill, pass the soil section, step down and up the rocky gully and it's on the left shortly after the pale green "christmas tree". </location_description>
<approach></approach>
<underground_description></underground_description>
<photo></photo>
<photo><p><a href="../expofiles/photos/2007/Olly/IMG_2761.JPG"><img src="83/IMG_2761_small.jpg"></a> <a href="../expofiles/photos/2007/Olly/IMG_2762.JPG"><img src="83/IMG_2762_small.jpg"></a></p><p>Photo &copy; Olly Betts 2007</p></photo>
<!-- marking options: P = Paint,
P? = Paint (?),
T = Tag,