From c98ed6a3c1514ebc5f9c6e3854b9e230e997317d Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Tue, 5 Aug 2014 13:06:20 +0100
Subject: [PATCH 1/2] Correct path to entrance photo

---
 noinfo/entrance_data/1623-204f.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/noinfo/entrance_data/1623-204f.html b/noinfo/entrance_data/1623-204f.html
index 315534a4c..4dc760805 100644
--- a/noinfo/entrance_data/1623-204f.html
+++ b/noinfo/entrance_data/1623-204f.html
@@ -16,7 +16,7 @@
 <approach></approach>
 <underground_description></underground_description>
 <photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG">
-<img alt="204f tag location" src="entrance204f-small.jpg"></a>
+<img alt="204f tag location" src="i/entrance204f-small.jpg"></a>
 <p>204f tag position</p></div></photo>
 <!-- marking options: P  = Paint,
                       P? = Paint (?),

From 9446c5600ceb0a502c432752edf7ad65de1afc2f Mon Sep 17 00:00:00 2001
From: expoonserver <devnull@localhost>
Date: Tue, 5 Aug 2014 13:08:03 +0100
Subject: [PATCH 2/2] Fix up dump3d output parsing in prospecting-guide script
 to recognise new 3d types in survex >= 1.2.7

---
 .../make-prospectingguide-new.py                          | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
index 2a3427078..bf989cd68 100644
--- a/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
+++ b/noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
@@ -343,7 +343,7 @@ for fnm in ("../all.3d", "../alltracks.3d"):
 		for l in file3d:
 			match = re.match(r'''
 			                  ^                 #start
-					  (MOVE|LINE|NODE)   #one of three command types
+		(MOVE|LINE|NODE|XSECT|XSECT_END|STOP)        #one of six data types
 					  \s+(-?[0-9.]+)     #X-co-ord
 					  \s+(-?[0-9.]+)     #Y-co-ord
 					  \s+(-?[0-9.]+)     #altitude
@@ -386,10 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"):
 				else:
 					draw.line([lastx, lasty, x, y], fill="#800080")
 			lastx,lasty = x,y
-		if not file3d.close():
-			# FIXME: If dump3d can't gives an error and exits with non-zero status, this
+		#if not file3d.close():
+			# FIXME: If dump3d can't give an error and exits with non-zero status, this
 			# doesn't get triggered...
-			print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
+			#print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
 	surfacecolour = "#008000"
 	repath = re.compile(r'^')
 print "Done"