From 900f120de15dc6e27e0365bd394084b237c6ea70 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 10 Apr 2021 19:05:24 +0100 Subject: [PATCH] fixes to /noinfo/ description links --- 1623/via201.htm | 2 +- 1623/vianip.htm | 2 +- 1626/index.html | 12 ++-- Makefile | 51 +++++++++-------- aausee.html | 13 +++-- entrance_data/1623-115.html | 2 +- entrance_data/1623-142.html | 4 +- entrance_data/1623-40a.html | 2 +- entrance_data/1623-B5.html | 2 +- handbook/computing/manual.html | 84 +-------------------------- noinfo/cave-number-index | 2 +- piclinks/way-40.htm | 6 +- survey.html | 100 --------------------------------- years/2005/mission.html | 2 +- 14 files changed, 54 insertions(+), 230 deletions(-) delete mode 100644 survey.html diff --git a/1623/via201.htm b/1623/via201.htm index 0e56bc88f..7a2ef6e83 100644 --- a/1623/via201.htm +++ b/1623/via201.htm @@ -45,7 +45,7 @@ src="others/t/via201.jpg" width=149 height=120>

The main 201 path beyond 1623/28 leads after several minutes to a strongly draughting entrance on the left numbered -32. To the left after this +32. To the left after this are routes to 41, 141 and 142 and the original approaches to 143 and 144. The main path descends steeply for a while; 115 lies diff --git a/1623/vianip.htm b/1623/vianip.htm index 4f1187208..76d80f9af 100644 --- a/1623/vianip.htm +++ b/1623/vianip.htm @@ -43,7 +43,7 @@ Stellerweghöhlensystem, and a number of caves not explored by CUCC, are reached by following this junction path. This starts out well-marked with cairns and red paint spots/arrows. After a short while, it traverses below a cliff on the left. At the far end of this, a climb up reaches a well-hidden -route to Schwabenschacht (1623/78).

+route to Schwabenschacht (1623/78).

View from the path between Stoger Weg and the Nipple. The gemse on the path ahead is
near the point where the Schwabenschacht path branches off. Photo © Paul Hammond 1999.

diff --git a/1626/index.html b/1626/index.html index d898c238a..0e919bbe1 100644 --- a/1626/index.html +++ b/1626/index.html @@ -25,7 +25,7 @@ To the east here is area 1627, and the eastern border of 1626 turns north.

of which has been visited by CUCC, as they tend to be difficult of access, or very much reserved to the Austrian cavers. The latter applies particularly to Raucherkarhöhle with its many +href="../1626/55.htm">Raucherkarhöhle with its many entrances near the Ischler Hütte, accessible by paths from Rettenbach. This is well documented on the website of the corresponding Austrian caving club, the Feuertal valleys north of the Schönberg ridge line, and reached only by immense and steep climbs up from the north to the Ebenseer Hochkogelhütte. The oldest and most extensive cave in this area is Ahnenschacht, +lang="de-at">Ahnenschacht, visited by the B.E.C. in the late sixties, and pushed by many other groups since.

@@ -45,10 +45,10 @@ sixties, and pushed by many other groups since.

href="../others/gsab/index.htm">GSAB explored a series of deep systems in the seventies - about the same time that CUCC first visited Austria. These include Trunkemboldschacht -854m; the four +href="../1626/117.htm">Trunkemboldschacht -854m; the four entrances of Feuertalsystem -913m; and the smaller Ufoschacht or +href="../1626/120.htm">Feuertalsystem -913m; and the smaller Ufoschacht or Gouffre Ovni, -565m.

Two expeditions by LUSS in the late @@ -62,7 +62,7 @@ around five hour walks-in.

As you might expect, CUCC has visited only the most accessible cave in the area, the resurgence of Naglsteghöhle, which is a pleasant +href="../1626/5.htm">Naglsteghöhle, which is a pleasant five minute stroll from the bar at Blaa-Alm.

There are approaching two hundred caves known at present in the area, but diff --git a/Makefile b/Makefile index b09068090..4d0d7a204 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ # Makefile to run the various scripts needed once hg and git updates have been performed. +# This desperately needs properly revising by someone who knows both the history and also how things are done now [April 2021] + dataset_path = ../loser surveydir_path = ../surveys cavern_flags = -qq -s -v7 @@ -7,8 +9,8 @@ tar_flags = -cz --exclude "*/CVS" --ignore-case -f svxtrace_cmd = ./svxtrace.py #things needed to run this stuff -#python imaging library, freesans or arial truetype font, dump3d, cavestats -#Debian packages: python-imaging, ttf-freefont, perl, python +#python3 imaging library, freesans or arial truetype font, dump3d, cavestats +#Debian packages: python3-imaging, ttf-freefont, perl, python3 #dump3d needs to be built in configured survex sources with cd src;make dump3d # @@ -24,11 +26,11 @@ autogen_pages: noinfo/lengths.dat noinfo/1623-and-1626.pos noinfo/cavestats # cavestats should be BUILT AUTOMATICALLY rather than having to be # built manually in a survex build tree. #indxal.htm: noinfo/CAVETAB2.CSV noinfo/all.pos noinfo/make-indxal4.pl noinfo/areapage_skeletons/*.html noinfo/lengths.dat -# python noinfo/make-areaindices.py noinfo/cavestats +# python3 noinfo/make-areaindices.py noinfo/cavestats # cd noinfo; perl ./make-indxal4.pl -q CAVETAB2.CSV noinfo/lengths.dat: - python noinfo/create_dplong_table.py + python3 noinfo/create_dplong_table.py noinfo/1623-and-1626.pos: noinfo/1623-and-1626.3d 3dtopos noinfo/1623-and-1626.3d noinfo/1623-and-1626.pos @@ -42,7 +44,7 @@ noinfo/cavestats: folklist: folk/index.htm $(dataset_path)/1623-and-1626.svx folk/index.htm: folk/folk.csv scripts/make-folklist.py - python scripts/make-folklist.py < folk/folk.csv > folk/index.htm + python3 scripts/make-folklist.py < folk/folk.csv > folk/index.htm ########### @@ -56,17 +58,18 @@ folk/index.htm: folk/folk.csv scripts/make-folklist.py # there appears to be no sensible way to run this at need. ########### +#QM files are now outo built in troggle for all caves-1623/ -qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html +# qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html -1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl - cd 1623/204; perl tablize-qms.pl qm.csv +# 1623/204/qm.html: 1623/204/qm.csv 1623/204/tablize-qms.pl + # cd 1623/204; perl tablize-qms.pl qm.csv -1623/234/qm.html: 1623/234/qm.csv 1623/234/tablize-qms.pl - cd 1623/234; perl tablize-qms.pl qm.csv +# 1623/234/qm.html: 1623/234/qm.csv 1623/234/tablize-qms.pl + # cd 1623/234; perl tablize-qms.pl qm.csv -1623/258/qm.html: 1623/258/qm.csv 1623/258/tablize-qms.pl - cd 1623/258; perl tablize-qms.pl qm.csv +# 1623/258/qm.html: 1623/258/qm.csv 1623/258/tablize-qms.pl + # cd 1623/258; perl tablize-qms.pl qm.csv 1623/204/atoz.html: 1623/204/glossary.csv 1623/204/make-glossary.pl cd 1623/204; perl make-glossary.pl glossary.csv @@ -96,8 +99,8 @@ qmlists: 1623/204/qm.html 1623/204/atoz.html 1623/234/qm.html 1623/258/qm.html #this requires ttf-freefont package to be installed #And dump3d from survex prospecting_guide: 3dfiles freefont noinfo/lengths.dat - cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py - cd noinfo/prospecting_guide_scripts && python make-prospectingguide-new.py --white + cd noinfo/prospecting_guide_scripts && python3 make-prospectingguide-new.py + cd noinfo/prospecting_guide_scripts && python3 make-prospectingguide-new.py --white freefont: /usr/share/fonts/truetype/freefont/FreeSans.ttf # ttf-freefont needs to be installed (or MS corefonts) @@ -109,20 +112,20 @@ dump3d: noinfo/prospecting_guide_scripts/dump3d # make dump3d && cp dump3d $(pwd)/noinfo/prospecting_guide_scripts/dump3d ########### +# We don't do the tarfile thing anymore +# tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz -tarfiles: noinfo/all.tgz 1623/204/surveydata.tgz 1623/234/surveydata.tgz 1623/76/surveydata.tgz +# noinfo/all.tgz: noinfo/1623-and-1626.3d + # tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser -noinfo/all.tgz: noinfo/1623-and-1626.3d - tar $(tar_flags) noinfo/all.tgz -C $(dataset_path)/.. loser +# 1623/204/surveydata.tgz: 1623/204/204.3d + # tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204 -1623/204/surveydata.tgz: 1623/204/204.3d - tar $(tar_flags) 1623/204/surveydata.tgz -C $(dataset_path)/caves-1623/ 204 +# 1623/234/surveydata.tgz: 1623/234/234.3d + # tar $(tar_flags) 1623/234/surveydata.tgz -C $(dataset_path)/caves-1623/ 234 -1623/234/surveydata.tgz: 1623/234/234.3d - tar $(tar_flags) 1623/234/surveydata.tgz -C $(dataset_path)/caves-1623/ 234 - -1623/76/surveydata.tgz: 1623/76/76.3d - tar $(tar_flags) 1623/76/surveydata.tgz -C $(dataset_path)/caves-1623/ 76 +# 1623/76/surveydata.tgz: 1623/76/76.3d + # tar $(tar_flags) 1623/76/surveydata.tgz -C $(dataset_path)/caves-1623/ 76 # (tarfiles depend on 3d files to avoid running the # expensive $(shell ...) commands more than necessary.) diff --git a/aausee.html b/aausee.html index 2de597dc9..e0ad2071e 100644 --- a/aausee.html +++ b/aausee.html @@ -24,9 +24,9 @@ Altausseer See at 712m above sea level.

In much wetter weather, water emerges from flood risings on the north shore or much higher on the hillside. The closest to the lake, Wasserlöcher, is associated with a +href="/1623/2.htm">Wasserlöcher, is associated with a significant cave, Liägerhöhle. Another major stream +href="/1623/1.htm">Liägerhöhle. Another major stream course enters the lake further west, near some boat houses and places of refreshment at the end of the motorable road. This is normally dry, but apparently carries huge volumes of flood water from risings at about 1080m in @@ -38,16 +38,17 @@ Altaussee) a glacier-carved valley rises to the pass of Hochklapf Sattel. A steep path can be followed up through woodland to join the Stögerweg path from the Stellerweghöhle area, which continues NE -to Wildensee. There are a few caves west of this -path, below the cliffs of Weiße Wand.

+to Wildensee. There are a few caves west of this +path, below the cliffs of Weiße Wand.

  • Full Index to 1623
  • 1623 Area/Subarea description
    • -
  • Back to Expedition Intro page
    • +
  • Back to Expedition Intro page
    • diff --git a/entrance_data/1623-115.html b/entrance_data/1623-115.html index 4ec372482..8ffd01192 100644 --- a/entrance_data/1623-115.html +++ b/entrance_data/1623-115.html @@ -24,7 +24,7 @@ Now follow "path" down and to the right across 2 areas of soil/grass/loose stone
    At the twisted dead tree root there is an obvious route leading to the right. At this point you are only 13m from p115x but you can't see it as it faces S. and you are approaching from the N. 10m on you pass a large anthill and then 3m further and you're there.
    -1983 description: Follow Stögerweg beyond Windloch to a steep descent. Just below this, by a large tree [now believed to have vanished in 2018] on the right of the path (permanent survey station P3), descend steeply to the right on a barely discernible trod.

    This involves at least one freeclimb which is awkward with lots of kit. Make lots of noise if you are first, especially on the first trip, since snakes seem to like it here. Eventually a large horizontal railway-tunnel-like entrance appears. If you fall off a cliff, you've gone a little too far downhill. +1983 description: Follow Stögerweg beyond Windloch to a steep descent. Just below this, by a large tree [now believed to have vanished in 2018] on the right of the path (permanent survey station P3), descend steeply to the right on a barely discernible trod.

    This involves at least one freeclimb which is awkward with lots of kit. Make lots of noise if you are first, especially on the first trip, since snakes seem to like it here. Eventually a large horizontal railway-tunnel-like entrance appears. If you fall off a cliff, you've gone a little too far downhill. T? -The entrance was prominently numbered '132' in red but this was finally changed in 1996 after the connection to Schwabenschacht (1623-78) +The entrance was prominently numbered '132' in red but this was finally changed in 1996 after the connection to Schwabenschacht (1623-78) -

    - - - - diff --git a/years/2005/mission.html b/years/2005/mission.html index d83140fd5..efd0a234e 100644 --- a/years/2005/mission.html +++ b/years/2005/mission.html @@ -71,7 +71,7 @@ band of harder cherty rock