Merge from server

Adding lots to .hgignore

noinfo/areapage_skeletons/41area.html

@@ -30,7 +30,7 @@ system, there are a number of smaller caves which have not (so far) been connect
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="index.html">Back to area description</a></li>
 <li><a href="../indxal.htm">Full Index</a></li>
 <li><a href="../areas.htm">Other Areas</a></li>

noinfo/areapage_skeletons/gschwand.html

@@ -50,7 +50,7 @@ Alm.</p>
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../indxal.htm">Full Index to 1623</a></li>
 <li><a href="../areas.htm">1623 Area/Subarea description</a></li>
 <li><a href="../index.htm">Back to Expedition Intro page</a></li>

noinfo/areapage_skeletons/kratzer.html

@@ -49,7 +49,7 @@ some way before realising the error.</p>
 <destination dest="kratzer/index.html" />
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../index.htm">Back to Expedition Intro page</a>
 <ul>
 <li><a href="../indxal.htm">Full Index</a></li>

noinfo/areapage_skeletons/plateau.html

@@ -95,7 +95,7 @@ work.</p>
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../index.htm">Back to Expedition Intro page</a>
 <ul>
 <li><a href="../indxal.htm">Full Index</a></li>

noinfo/areapage_skeletons/remote.html

@@ -47,7 +47,7 @@ BS17, whose description is included here.</p>
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../indxal.htm">Full Index to 1623</a></li>
 <li><a href="../areas.htm">1623 Area/Subarea description</a></li>
 <li><a href="../1626/index.html">Adjacent area 1626</a></li>

noinfo/areapage_skeletons/smkridge.html

@@ -79,7 +79,7 @@ recently discovered 161g and 161h entrances.</li>
 <hr />
 
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../indxal.htm">Full Index</a> to caves in all areas</li>
 <li><a href="../areas.htm">Other Areas</a></li>
 <li><a href="../index.htm">Back to Expedition Intro page</a></li>

noinfo/areapage_skeletons/via161.html

@@ -40,7 +40,7 @@ entrance.
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="index.html">Back to area description</a></li>
 <li><a href="../indxal.htm">Full Index</a></li>
 <li><a href="../areas.htm">Other Areas</a></li>

noinfo/areapage_skeletons/wilden.html

@@ -40,7 +40,7 @@ exploratory effort anywhere in the area.
 
 <hr />
 <!-- LINKS -->
-<ul>
+<ul id="links">
 <li><a href="../indxal.htm">Full Index to 1623</a></li>
 <li><a href="../areas.htm">1623 Area/Subarea description</a></li>
 <li><a href="../index.htm">Back to Expedition Intro page</a></li>

noinfo/cavestats.build

@@ -0,0 +1,15 @@
+#How to build cavestats binary
+
+apt-get source survex
+sudo apt-get build-dep survex
+pushd
+cp cavestats.c survex-*/src
+cd survex-*
+dpkg-buildpackage
+cd src
+gcc -DHAVE_CONFIG_H -I. -I.. -DIMG_HOSTED   -Wall -W -Wunused -Wshadow
+-Wpointer-arith      -Wmissing-prototypes -Wwrite-strings
+-Wredundant-decls -Wnested-externs      -Wcast-align -g -O2 -O2 -MT
+3dtopos.o -MD -MP namecmp.o img.o useful.o cmdline.o message.o
+filename.o osdepend.o z_getopt.o getopt1.o -o cavestats cavestats.c -lm
+mv cavestats ../../

noinfo/create_dplong_table.py

@@ -87,6 +87,10 @@ def parse_csvfile():
 
 # Main routine:
 
+if (not os.access('CS_BINARY', os.X_OK)): 
+	print "%s not executable - skipping %s" % (CS_BINARY, __file__)
+	exit(1)
+	
 caveslist = parse_csvfile()
 
 dplong = file("dplong.htm", "w")

noinfo/folk.csv

@@ -56,7 +56,7 @@
 "Tim Farrar","Farrar",,,"i/tim_farrar.jpg",,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
 "Simon Farrow","Farrow",,,"l/simonf.htm",,1,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 "Andy Farrow","Farrow",,,"i/andy_farrow.jpg",,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,
-"David Fearon","Fearon",,,"i/davef.jpg",,,,,,,,,,,,,,,1,,1,,,,1,,,,,,,,,,,,,
+"David Fearon (Damage)","Fearon",,,"i/davef.jpg",,,,,,,,,,,,,,,1,,1,,,,1,,,,,,,,,,,,,
 "Mark Fearon","Fearon",,,"l/markf.htm",,,,,,,,,,,,,1,1,1,1,,,,,1,,,,,,,,,,,,,
 "Aggy Finn","Finn",,,"i/aggy_finn.jpg",,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
 "Doug Florence","Florence",,,"l/dougf.htm",,,1,,,,1,,,,,,,-1,,,,,,,,,,,,,,,,,,,,
@@ -70,7 +70,7 @@
 "Andy Goddard","Goddard",1,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,
 "Judith Greaves","Greaves",,,"i/judith.jpg",,,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
 "Hilary Greaves (Hils)","Greaves",1,,"i/hilary_greaves.jpg",,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,
-"Martin Green","Green",,,"i/marting.jpg",,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,1,,
+"Martin Green","Green",,,"i/marting.jpg",,,,,,,,,,,,,,,,,,,,,,,,,1,1,1,1,1,1,,1,,1
 "Naomi Griffiths","Griffiths",,,"i/naomi.jpg",,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
 "Julian Griffiths","Griffiths",,,,,1,1,1,1,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
 "Julian Haines","Haines",,1,"i/haines.jpg",,,,,,,,,,,,,,,,1,1,1,1,1,1,1,1,1,,,,1,,,,,,
@@ -231,3 +231,4 @@
 "Holly Bradley","Bradley",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
 "Noel Snape","Snape",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
 "Gareth Phillips","Phillips",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+"Jess Hatchett","Hatchett",,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1

noinfo/make-indxal4.pl

@@ -265,7 +265,7 @@ sub do_this_line {
        $path =~ s/\/$fn//g;
 
        # Make the directory that the file is in, in case it doesn't exist yet
-       #mkpath($path);
+       mkpath($path);
        # this is considered harmful now creation of directories is versioned - DL
 
        # Open the file and start writing to it

noinfo/smkridge/l/116elv.htm

@@ -18,7 +18,7 @@
   <hr />
   <!-- LINKS -->
 
-  <ul>
+  <ul id="links">
     <li>
       <a href="../../../smkridge/index.html#id116">Schwarzmooskogel area</a> index and description
 

noinfo/smkridge/l/116pln.htm

@@ -17,7 +17,7 @@
   <hr />
   <!-- LINKS -->
 
-  <ul>
+  <ul id="links">
     <li>
       <a href="../../../smkridge/index.html#id116">Schwarzmooskogel area</a> index and description