Update remaining instances of cucc.survex.com/expo to expo.survex.com

This commit is contained in:
Wookey 2018-03-01 01:01:34 +00:00
parent 0ac7d1f2c4
commit 310e95f4b6
7 changed files with 27 additions and 27 deletions

View File

@ -361,7 +361,7 @@ university since Feb 2014.</p>
<p>Overview of the automagical scripts on the expo website</p>
Script location Input file Output file Purpose
/svn/trunk/expoweb/noinfo/make-indxal4.pl /svn/trunk/expoweb/noinfo/CAVETAB2.CSV many produces all cave description pages
</br>/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://cucc.survex.com/expo/folk/index.htm Table of all expo members
</br>/svn/trunk/expoweb/noinfo/make-folklist.py /svn/trunk/expoweb/noinfo/folk.csv http://expo.survex.com/folk/index.htm Table of all expo members
</br>/svn/trunk/surveys/tablize-csv.pl /svn/trunk/surveys/tablizebyname-csv.pl
/svn/trunk/surveys/Surveys.csv

View File

@ -120,7 +120,7 @@ function securityChecks ()
echo "<title>Expo 2004 Application Form Error -- Cambridge University Caving Club</title>";
echo "</head>";
echo "<FORM ACTION=\"http://cucc.survex.com/expo/signup/submit.php?action=commit\" METHOD=\"POST\">";
echo "<FORM ACTION=\"http://expo.survex.com/signup/submit.php?action=commit\" METHOD=\"POST\">";
printHidden ();
echo <<<END
@ -158,7 +158,7 @@ END;
being included in the Bier Book on Expo.</P>
<HR>
<FORM ACTION="http://cucc.survex.com/expo/signup/submit.php?action=preview" METHOD="POST">
<FORM ACTION="http://expo.survex.com/signup/submit.php?action=preview" METHOD="POST">
<H2>Section A: Personal information<h2>
@ -223,7 +223,7 @@ END;
<h3>Transport</h2>
<p>Please look now at the <a target="_blank" href="http://cucc.survex.com/expo/years/2004/travel.html">transport arrangements page</a> (will open in a new window). Then select one of the following.
<p>Please look now at the <a target="_blank" href="http://expo.survex.com/years/2004/travel.html">transport arrangements page</a> (will open in a new window). Then select one of the following.
<p><input type="radio" name="transport_ok" value="yes" tabindex=38
END;
@ -356,7 +356,7 @@ END;
<H2>Contact details</H2>
<h3>Your details</h3>
<p>
<FORM ACTION="http://cucc.survex.com/expo/signup/submit.php?action=commit" METHOD="POST">
<FORM ACTION="http://expo.survex.com/signup/submit.php?action=commit" METHOD="POST">
END;
printHidden ();
@ -547,7 +547,7 @@ END;
<p>Thank you for your application. Please address any questions
to the Expo Leader, <a href="mailto:oghm2&#64cam.ac.uk">Olly Madge</a>.
<p><a href="http://cucc.survex.com/expo/">Return to the main Expo page</a>.
<p><a href="http://expo.survex.com/">Return to the main Expo page</a>.
END;
}

View File

@ -142,7 +142,7 @@ Proper write up soon. x x x dunks</p></blockquote>
<p>The CUCC Expo documentation archive, maintained as a Web site, is currently being updated with the finds from Expo '99. This comprehensive cross-referenced resource provides an excellent knowledge base of information for future expeditions.</p>
<p>The archive can be viewed on the Web at the following address:</p>
<div class="centre"><p><a href="../../index.htm">http://cucc.survex.com/expo/index.htm</a></p></div>
<div class="centre"><p><a href="../../index.htm">http://expo.survex.com/index.htm</a></p></div>
<h3>Concluding Remarks</h3>

View File

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>Expo 2006: travel arrangements</title>
<link rel="stylesheet" type="text/css" href="http://cucc.survex.com/expo/css/main2.css" />
<link rel="stylesheet" type="text/css" href="http://expo.survex.com//css/main2.css" />
<style type="text/css">
<!--
td.f { background: #7f96e8; width: 80pt; font-size: 10pt }

View File

@ -16,23 +16,23 @@
<td colspan="3" align="center"><strong><em>The Cambridge Austrian Cave Science Expedition thanks the following organizations for their approval and support...</em></strong></td>
</tr>
<tr>
<td align="center"><a href="http://www.rgs.org/"><img src="http://cucc.survex.com/expo/years/2007/RGSlogo.gif" alt="Royal Geographical Society" width="142" height="103" border="0" align="middle"></a></td>
<td align="center"><a href="http://www.cam.ac.uk"><img src="http://cucc.survex.com/expo/years/2007/camlogo.gif" alt="University of Cambridge" width="204" height="47" border="0" align="middle"></a></td>
<td align="center"><a href="http://www.bcra.org.uk/gpf/index.html"><img src="http://cucc.survex.com/expo/years/2007/BCRAlogo.gif" alt="British Cave Research Association" width="77" height="115" border="0" align="middle"></a></td>
<td align="center"><a href="http://www.rgs.org/"><img src="http://expo.survex.com/years/2007/RGSlogo.gif" alt="Royal Geographical Society" width="142" height="103" border="0" align="middle"></a></td>
<td align="center"><a href="http://www.cam.ac.uk"><img src="http://expo.survex.com/years/2007/camlogo.gif" alt="University of Cambridge" width="204" height="47" border="0" align="middle"></a></td>
<td align="center"><a href="http://www.bcra.org.uk/gpf/index.html"><img src="http://expo.survex.com/years/2007/BCRAlogo.gif" alt="British Cave Research Association" width="77" height="115" border="0" align="middle"></a></td>
</tr>
</table>
<table width=100% border="0">
<td colspan="9" align="center"><strong><em>...and these companies for their generous sponsorship.</em></strong></td>
</tr><tr>
<td width="10%" height="100" align="center"><a href="http://www.pasela.se/"><img src="http://cucc.survex.com/expo/years/2007/paselaLogo.gif" alt="Thomas Tunnock's" width="142" height="40" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.tunnock.co.uk/"><img src="http://cucc.survex.com/expo/years/2007/PrincetonTecLogo.jpg" alt="Thomas Tunnock's" width="128" height="42" border="0"></a></td>
<td width="10%" height="100" align="center"><a href="http://www.peli.com/"><img src="http://cucc.survex.com/expo/years/2007/PeliLogo.jpg" alt="Peli" width="73" height="76" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.whitworths.com/"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg" alt="Peli" width="107" height="66" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.mornflake.com"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg/MornflakeLogo.jpg" alt="Mornflake" width="98" height="61" border="0"></a></td>
<td width="10%" align="center"><a href="http://stores.ebay.com/Mickies-Place-Outdoor-Gear"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg/Mickies-Place-logo-6.gif" alt="Mickie's Place" width="111" height="60" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.tunnock.co.uk/"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg/TunnocksLogo.jpg" alt="Thomas Tunnock's" width="127" height="71" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.silva.se/"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg/SilvaLogo.jpg" alt="Silva" width="121" height="37" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.hilti.co.uk/"><img src="http://cucc.survex.com/expo/years/2007/whitworthsLogo.jpg/hiltiLogo.gif" alt="Silva" width="97" height="20" border="0"></a></td>
<td width="10%" height="100" align="center"><a href="http://www.pasela.se/"><img src="http://expo.survex.com/years/2007/paselaLogo.gif" alt="Thomas Tunnock's" width="142" height="40" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.tunnock.co.uk/"><img src="http://expo.survex.com/years/2007/PrincetonTecLogo.jpg" alt="Thomas Tunnock's" width="128" height="42" border="0"></a></td>
<td width="10%" height="100" align="center"><a href="http://www.peli.com/"><img src="http://expo.survex.com/years/2007/PeliLogo.jpg" alt="Peli" width="73" height="76" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.whitworths.com/"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg" alt="Peli" width="107" height="66" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.mornflake.com"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg/MornflakeLogo.jpg" alt="Mornflake" width="98" height="61" border="0"></a></td>
<td width="10%" align="center"><a href="http://stores.ebay.com/Mickies-Place-Outdoor-Gear"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg/Mickies-Place-logo-6.gif" alt="Mickie's Place" width="111" height="60" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.tunnock.co.uk/"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg/TunnocksLogo.jpg" alt="Thomas Tunnock's" width="127" height="71" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.silva.se/"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg/SilvaLogo.jpg" alt="Silva" width="121" height="37" border="0"></a></td>
<td width="10%" align="center"><a href="http://www.hilti.co.uk/"><img src="http://expo.survex.com/years/2007/whitworthsLogo.jpg/hiltiLogo.gif" alt="Silva" width="97" height="20" border="0"></a></td>
</tr>
</table>

View File

@ -161,7 +161,7 @@ Ps is the bread maker OK, I can't remember????
</p><p>There are several categories, and sometimes it makes sense to spread the work over several people:
</p>
<ol><li> Top camp food
<ol><li> Ready mixed <a href="http://cucc.survex.com/expo/years/2004/recipes.html" class="external text" title="http://cucc.survex.com/expo/years/2004/recipes.html" rel="nofollow">dinners</a> based around rice/pasta/TVP &amp; dried vegetables
<ol><li> Ready mixed <a href="http://expo.survex.com/years/2004/recipes.html" class="external text" title="http://expo.survex.com/years/2004/recipes.html" rel="nofollow">dinners</a> based around rice/pasta/TVP &amp; dried vegetables
</li><li> Breakfast supplies such as Oatso simple, tea, musli
</li></ol>
</li><li> Cave food

View File

@ -144,14 +144,14 @@ var wgRestrictionMove = [];
</p>
<a name="Siberia_.2F_Midnight_in_Moscow"></a><h3> <span class="mw-headline">Siberia / Midnight in Moscow</span></h3>
<p>Other than the dig at the very bottom, I can't think of much to
do in Siberia. The <a href="http://cucc.survex.com/expo/1623/161/sibria.htm#siberia" class="external text" title="http://cucc.survex.com/expo/1623/161/sibria.htm#siberia" rel="nofollow">description</a> mentions at least one lead on the
do in Siberia. The <a href="http://expo.survex.com/1623/161/sibria.htm#siberia" class="external text" title="http://expo.survex.com/1623/161/sibria.htm#siberia" rel="nofollow">description</a> mentions at least one lead on the
way down (but not where I remember there being one), and the lead
I can remember on the way down is a body-sized tube not far below
SEP. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 05:41, 28 May 2008 (BST)
</p><p>Well, the leads list largely agrees with my recollection, but there are quite a lot of 'C' leads I'd forgotten about, especially in Fuzzy Logic, where there's also a surprising 'A' lead that apparently hasn't been done. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 02:37, 29 May 2008 (BST)
</p>
<a name="Documented_Leads"></a><h4> <span class="mw-headline">Documented Leads</span></h4>
<p>All leads marked 'Sib' or 'Fuz' in <a href="http://cucc.survex.com/expo/1623/161/qmtodo.htm" class="external text" title="http://cucc.survex.com/expo/1623/161/qmtodo.htm" rel="nofollow">161 outstanding QMlist after 1997</a>. [C1997-161-26 A] removed from the list as it was the main way on and was pushed the following year. According to the description there are no leads (other than digs and avens) below this point, which agrees with my memory. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 02:37, 29 May 2008 (BST)
<p>All leads marked 'Sib' or 'Fuz' in <a href="http://expo.survex.com/1623/161/qmtodo.htm" class="external text" title="http://expo.survex.com/1623/161/qmtodo.htm" rel="nofollow">161 outstanding QMlist after 1997</a>. [C1997-161-26 A] removed from the list as it was the main way on and was pushed the following year. According to the description there are no leads (other than digs and avens) below this point, which agrees with my memory. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 02:37, 29 May 2008 (BST)
</p>
<dl><dt>C1997-161-21 B
</dt><dd>Sib: Hole below pendule at foot of Vom pitch is given as "undescended" (Wookey reckons it can be seen to choke [I reckon so too, although it's in a very good location for a connection if it went <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 02:37, 29 May 2008 (BST)]) [Burblmaze.1]
@ -188,11 +188,11 @@ SEP. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&am
</dd></dl>
<a name="The_Far_End"></a><h3> <span class="mw-headline">The Far End</span></h3>
<p>I've never been to The Far End, but it does sound rather good.
Check out <a href="http://cucc.survex.com/expo/1623/161/farnth.htm" class="external text" title="http://cucc.survex.com/expo/1623/161/farnth.htm" rel="nofollow">the description</a>. Strong draughts and several big undescended pitches! <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 05:41, 28 May 2008 (BST)
Check out <a href="http://expo.survex.com/1623/161/farnth.htm" class="external text" title="http://expo.survex.com/1623/161/farnth.htm" rel="nofollow">the description</a>. Strong draughts and several big undescended pitches! <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 05:41, 28 May 2008 (BST)
</p><p>Don't be put off by the name <i>The Far End</i>; it's relatively straightforward caving to get there (certainly <i>much</i> easier than most of the trips in 204 last year), the distance involved is comparable to visiting the furthest leads in Tunnockschacht, and if the 161d entrance is used the deepest point on the way to The Far End is only about 120m down and the depth to the likely connection area of 204 is under 350m. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 10:10, 8 June 2008 (BST)
</p>
<a name="Documented_Leads_2"></a><h4> <span class="mw-headline">Documented Leads</span></h4>
<p>All leads marked 'Far' in <a href="http://cucc.survex.com/expo/1623/161/qmtodo.htm" class="external text" title="http://cucc.survex.com/expo/1623/161/qmtodo.htm" rel="nofollow">161 outstanding QMlist after 1997</a>
<p>All leads marked 'Far' in <a href="http://expo.survex.com/1623/161/qmtodo.htm" class="external text" title="http://expo.survex.com/1623/161/qmtodo.htm" rel="nofollow">161 outstanding QMlist after 1997</a>
</p>
<dl><dt>C1993-161-01 A
</dt><dd>Far: Pitch in Even Further beyond Weasel Pit [FurtCham.5]
@ -269,7 +269,7 @@ Check out <a href="http://cucc.survex.com/expo/1623/161/farnth.htm" class="exter
</td><td align="right"> 30m
</td></tr></table>
<p>Clearly more tackle would be consumed and more time would be needed for rigging in and derigging if 'a' were used.
</p><p><b>Travel Time</b> A bit counterintuitively, it may actually be faster to go in and out using 'a' - in the 1993 log Wook reports getting <a href="http://cucc.survex.com/expo/years/1993/log.htm#id1993-161-21" class="external text" title="http://cucc.survex.com/expo/years/1993/log.htm#id1993-161-21" rel="nofollow">down to Knossos in 25 minutes</a>. Not sure about typical times required to climb out. Getting to and from 'a' on the surface (from just about anywhere) takes less time than for 'd'.
</p><p><b>Travel Time</b> A bit counterintuitively, it may actually be faster to go in and out using 'a' - in the 1993 log Wook reports getting <a href="http://expo.survex.com/years/1993/log.htm#id1993-161-21" class="external text" title="http://expo.survex.com/years/1993/log.htm#id1993-161-21" rel="nofollow">down to Knossos in 25 minutes</a>. Not sure about typical times required to climb out. Getting to and from 'a' on the surface (from just about anywhere) takes less time than for 'd'.
</p>
<a name="161d"></a><h3> <span class="mw-headline">161d</span></h3>
<p><b>Routefinding</b> In 161d there's a bit of piddling around near the entrance,
@ -399,7 +399,7 @@ time spent getting to the 'd' entrance on the surface.
</td><td>
</td><td>
</td></tr></table>
<p>Info for this table from <a href="http://cucc.survex.com/expo/1623/161/farnth.htm" class="external text" title="http://cucc.survex.com/expo/1623/161/farnth.htm" rel="nofollow">Mainline to Far North description</a>, <a href="http://cucc.survex.com/expo/1623/161/sibria.htm#yapate" class="external text" title="http://cucc.survex.com/expo/1623/161/sibria.htm#yapate" rel="nofollow">Mainline to Siberia description</a> and <a href="http://cucc.survex.com/expo/fixaid.htm" class="external text" title="http://cucc.survex.com/expo/fixaid.htm" rel="nofollow">Fixed Aids in CUCC Caves</a>, plus a little from my own memory. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 07:21, 28 May 2008 (BST)
<p>Info for this table from <a href="http://expo.survex.com/1623/161/farnth.htm" class="external text" title="http://expo.survex.com/1623/161/farnth.htm" rel="nofollow">Mainline to Far North description</a>, <a href="http://expo.survex.com/1623/161/sibria.htm#yapate" class="external text" title="http://expo.survex.com/1623/161/sibria.htm#yapate" rel="nofollow">Mainline to Siberia description</a> and <a href="http://expo.survex.com/fixaid.htm" class="external text" title="http://expo.survex.com/fixaid.htm" rel="nofollow">Fixed Aids in CUCC Caves</a>, plus a little from my own memory. <a href="/caving/wiki/index.php?title=User:Duncan.collis&amp;action=edit&amp;redlink=1" class="new" title="User:Duncan.collis (not yet written)">Duncan Collis</a> 07:21, 28 May 2008 (BST)
</p><p>Note that [1],[2] and [3] are alternatives - only one of them needs to be rigged, although [3] will need to be rigged temporarily in order to rig [1] or [2]
</p><p>It would be a <i>very good idea</i> to install stainless steel anchors and maillons on the up-pitches at Staircase 36 and strange Upfall. Frank has offered to donate suitable hanger/anchor assemblies for this purpose. These should be installed very carefully by somebody who isn't a muppet - they're expensive anchors and should last for well beyond our lifetimes, so don't invite Mr. Cockup on the trip.
</p>