Updates to caves to improve prospecting guide. Changed main page to 2013.

noinfo/prospecting_guide_scripts/make-prospectingguide-new.py

@@ -337,11 +337,7 @@ surfacecolour = "#808080"
 repath = re.compile(r'^(?:182to(?:tc|184)|tctocol|82to97|vd1to161d|161ftod|161etof|161etog|40entlink2|surfnr161|surf161|kansurf)$')
 for fnm in ("../all.3d", "../alltracks.3d"):
 	for mapcode in draws.keys():
-		try:
-			file3d = os.popen(dump3d_binary + " " + fnm)
-		except:
-			#dump3d doesn't return an error code on "Couldn’t open data file". It should.
-			print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
+		file3d = os.popen(dump3d_binary + " " + fnm)
 		draw = draws[mapcode]
 		lastx, lasty = 0, 0
 		for l in file3d:
@@ -364,6 +360,7 @@ for fnm in ("../all.3d", "../alltracks.3d"):
 					  $                  #end of the line
 					  ''', l, re.VERBOSE)
 			if not match: 
+				print "Unknown: " + l
 				continue
 
 			
@@ -389,6 +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
+			# doesn't get triggered...
+			print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
 	surfacecolour = "#008000"
 	repath = re.compile(r'^')
 print "Done"
@@ -414,7 +415,7 @@ for cave in cavetab:
 	area = re.sub(r' .*', "", area)
 	if area == '1626' or area == 'nonexistent': continue
 
-        try:
+	try:
 		loctuple = find_location(cave)
 	except:
 		print "Unable to find location for %s" % (number)