From a21ff2a0cc28f4d39fff100d6bda0bf2c8d7e364 Mon Sep 17 00:00:00 2001 From: Wookey Date: Wed, 8 Apr 2015 03:18:59 +0100 Subject: [PATCH] fix up URLs in static html for ${subarea} -> '1623' that have no leading slash --- .hgignore | 16 +-- Makefile | 8 +- bcamps.htm | 2 +- fester.htm | 2 +- fixaid.htm | 56 ++++----- gall0.htm | 266 +++++++++++++++++++++--------------------- geolog2.htm | 4 +- infodx.htm | 20 ++-- links.htm | 2 +- primer.htm | 6 +- survey.html | 12 +- tcamps.htm | 16 +-- update.htm | 2 +- years/1977/report.htm | 2 +- 14 files changed, 207 insertions(+), 207 deletions(-) diff --git a/.hgignore b/.hgignore index c2a6e669f..c6fb2de28 100644 --- a/.hgignore +++ b/.hgignore @@ -16,14 +16,14 @@ plateau.html remote.html wilden.html smkridge.html -smkridge/40area.html -smkridge/41area.html -smkridge/via161.html -smkridge/via204.html -smkridge/204/qm.html -smkridge/234/qm.html -smkridge/258/qm.html -smkridge/204/atoz.html +1623/40area.html +1623/41area.html +1623/via161.html +1623/via204.html +1623/204/qm.html +1623/234/qm.html +1623/258/qm.html +1623/204/atoz.html folk/index.htm noinfo/all.pos noinfo/lengths.dat diff --git a/Makefile b/Makefile index dfeb744ae..2e1278a12 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html ########### -3dfiles: noinfo/all.3d 1623/204/204.3d 1623/234/234.3d plateau/76/76.3d noinfo/alltracks.3d +3dfiles: noinfo/all.3d 1623/204/204.3d 1623/234/234.3d 1623/76/76.3d noinfo/alltracks.3d noinfo/all.3d: $(shell $(svxtrace_cmd) $(dataset_path)/all) cavern $(cavern_flags) $(dataset_path)/all -o noinfo/all.3d @@ -84,8 +84,8 @@ noinfo/all.3d: $(shell $(svxtrace_cmd) $(dataset_path)/all) 1623/234/234.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/234/234) cavern $(cavern_flags) $(dataset_path)/caves/234/234 -o 1623/234/234.3d -plateau/76/76.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/76/76) - cavern $(cavern_flags) $(dataset_path)/caves/76/76 -o plateau/76/76.3d +1623/76/76.3d: $(shell $(svxtrace_cmd) $(dataset_path)/caves/76/76) + cavern $(cavern_flags) $(dataset_path)/caves/76/76 -o 1623/76/76.3d noinfo/alltracks.3d: $(shell $(svxtrace_cmd) $(dataset_path)/fixedpts/gps/tracks/alltracks) cavern $(cavern_flags) $(dataset_path)/fixedpts/gps/tracks/alltracks.svx -o noinfo/alltracks.3d @@ -120,7 +120,7 @@ noinfo/all.tgz: noinfo/all.3d 1623/234/surveydata.tgz: 1623/234/234.3d tar $(tar_flags) 1623/234/surveydata.tgz -C $(dataset_path)/caves/ 234 -plateau/76/surveydata.tgz: plateau/76/76.3d +1623/76/surveydata.tgz: 1623/76/76.3d tar $(tar_flags) 1623/76/surveydata.tgz -C $(dataset_path)/caves/ 76 # (tarfiles depend on 3d files to avoid running the diff --git a/bcamps.htm b/bcamps.htm index 7b0ee5f05..947fa79f0 100644 --- a/bcamps.htm +++ b/bcamps.htm @@ -39,7 +39,7 @@ Staud'nwirt, by the road to Grundlsee. Here Hilde and Karin Wilpernig have made us very welcome for many years, and have provided us with many luxuries including some office space in 1984 and use of the "Potato Hut" ever since, which has sported a fridge for cold beer since 1995! So vital is this to expo -morale that some passage has been +morale that some passage has been named after it.

diff --git a/fester.htm b/fester.htm index 6bde75d8b..c05aae580 100644 --- a/fester.htm +++ b/fester.htm @@ -192,7 +192,7 @@ how wet it can get before you hurt yourself or drown" (Wookey). with the advantage of Schlagobers to appeal to the calorifically-challenged.
Mohr-im-Hemd -
No, not the passage in +
No, not the passage in Kaninchenhöhle, but the death-by-chocolate pudding which it was named after. The first challenge is to persuade the other attendees at the expo dinner to pay for the game if you win. The second challenge is to eat ten of diff --git a/fixaid.htm b/fixaid.htm index 094307dbc..241238de4 100644 --- a/fixaid.htm +++ b/fixaid.htm @@ -7,10 +7,10 @@
-Photos Photos Rigging - Glossary Glossary Expo @@ -91,56 +91,56 @@ responsible for any mishap arising from its use!

+Ambidextrous - + - + - + - - + - + - - + - + - + - + - + - + - - + + - + - - + - + - + - +
locationlengthdiameterrope vintage year left riggedhangersother info
5m up into Ragnarök from -Ambidextrous 10m19912
10m up into Time Dilation in Ambidextrous 21m (marked 39m)19912
Semi-detached
Semi-detached 10m?19951
Yapate traverse line
Yapate traverse line 8m10mm199119930
Staircase36
Staircase36 20m10mm19923
Strange +
Strange Downfall 22m10mm198819933
Strange Acrossfall
Strange Acrossfall 32m11mm199219934 maybe removed in 1994?
Strange Upfall
Strange Upfall 45m11mm19924
Satan's Sitting Room +
Satan's Sitting Room traverse 45m?19924
3 Wise Men
3 Wise Men 64m10mm19939
Tinkle Rift
Tinkle Rift about 12m9mm1991/219931
The Needle
The Needle 27m10mm(?)198819932
Cowboy Caver
Cowboy Caver 10m??19950
French Connection
French Connection 27m19912
Down to Zombie Slime, -up to Staud'nwirt Palace
Down to Zombie Slime, +up to Staud'nwirt Palace 30ftladdervery long tether Not usually left rigged
Moomintroll at [96-13]10m1997none
Bugger
Moomintroll at [96-13]10m1997none
Bugger 1996?
Fear-on traverse
Fear-on traverse ~40m19963(several naturals)
2nd 8m climb from Orchestral +
2nd 8m climb from Orchestral Pit ~20m19971
Traverse towards Footlights
Traverse towards Footlights ~20m19972 + couple of tapesRemoved 1999
Footlights traverse
Footlights traverse 26m19977Removed 1999
Gods' traverse and pitch to Elin Algor
Gods' traverse and pitch to Elin Algor ~100m1997many
3m climb in Tirolia Werke
3m climb in Tirolia Werke 5m19971
@@ -153,9 +153,9 @@ Pit 40e to top of SVH pitch40m ish ?11mm dynamic not recentunknownseveral VfHO's rope, may need to be dug out of ice -Up, Up pitchabout 12m  1999   -Hooked on Classics traverse23m9 mm199419991 old bend, 3 new bends, 3 twists, 2 rings, 1 bollard, 4 maillons  -18m climb after Hooked on classics20m?9 mm?20001 hanger  +Up, Up pitchabout 12m  1999   +Hooked on Classics traverse23m9 mm199419991 old bend, 3 new bends, 3 twists, 2 rings, 1 bollard, 4 maillons  +18m climb after Hooked on classics20m?9 mm?20001 hanger  Mission Impossible climb from SVH?m? mm?2001 or 2002~3 hangers  Too Across pendule30-50m?? mm?2001~6 hangers  Up pitch in Gnivac Rift20-40m?? mm?2001~4 hangers  diff --git a/gall0.htm b/gall0.htm index 5a1d59e47..1ec125462 100644 --- a/gall0.htm +++ b/gall0.htm @@ -33,7 +33,7 @@ load!

  • Carbide lamp designed by Martians - at Base Camp (44k)
  • Potato Hut supplies (61k)
  • Typing the survey in the Potato Hut (33k)
    • -
  • Bolting by hand after Drill failure (Driller Killer) (35k)
    • +
  • Bolting by hand after Drill failure (Driller Killer) (35k)
  • Drilling by power - Wookey shows the technique (54k)
  • Rope washing at the end of expo - river behind the Staud'nwirt (46k)
    • @@ -46,7 +46,7 @@ load!

  • Walk-in from Loser (78k)
  • Walk-in highest point, looking towards the col (55k)
  • Walk-in approaching Egglgrube (55k)
    • -
  • Walk-in - path 201 beyond Egglgrube (76k)
    • +
  • Walk-in - path 201 beyond Egglgrube (76k)
  • Bräuning wall from the Nipple (40k)
  • Vorderer Schwarzmooskogel summit
  • Route to non-CUCC entrances continuing from the Nipple (54k)
    • @@ -55,73 +55,73 @@ load!

    Vorderer Schwarzmooskogel southern area caves

    Surface - walks and approaches from path 201 to the plateau

    Caves on the plateau

    Kaninchenhöhle and its approaches

    @@ -137,97 +137,97 @@ load!

    The Right Hand Route

    France, Flat France, the new 161d entrance and Triassic Park area

    Puerile Humour Series and Iceland

    Wheelchair Access to the Lost World

    Steinschlagschacht, Forbidden Land and Chile

    Steinbrückenhöhle (1623/204)

    @@ -236,28 +236,28 @@ load!

    are mostly © Erin Lynch.

    Other caves on the Schwarzmooskogel ridge, north of VSK and over to HSK

    Surface and non-caving activities

    diff --git a/geolog2.htm b/geolog2.htm index cda68c844..c1be906cf 100644 --- a/geolog2.htm +++ b/geolog2.htm @@ -67,9 +67,9 @@ Loser block to the SE.

    The fossil phreatic passages seem to be much less dependent on joint direction, and appear to follow certain beds of the Dachsteinkalk. The clearest example is Yapate Inlet and Chicken Flied Nice, near Burble crawl in Kaninchenhöhle.

    +href="1623/161/top.htm">Kaninchenhöhle.

    -
    Cross-section sketch of Yapate and Burble Crawl

    Here, the small inlet tube of Burble Crawl, and the original main trunk tube diff --git a/infodx.htm b/infodx.htm index b02a9b7ab..b7beb6caa 100644 --- a/infodx.htm +++ b/infodx.htm @@ -13,12 +13,12 @@