expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-25 08:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

More pythonic if

Browse Source
This commit is contained in:
olly 2015-06-20 11:06:52 +12:00
parent 05b55391d6
commit 486ef4a633
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
View File

@ -65,7 +65,7 @@ def exists_in_path(cmd):
def chomp(s):
if not s: return s
if(s[-1]=="\n"): return s[:-1]
if s[-1]=="\n": return s[:-1]
else: return s
def find_effective_number(c):
@ -77,24 +77,24 @@ def find_effective_number(c):
def longnumber(c, number):
"""Both numbers"""
if (c["Unofficial number"] and c["Unofficial number"] != number):
if c["Unofficial number"] and c["Unofficial number"] != number:
return number + " (" + c["Unofficial number"] + ")"
else:
return number
def find_location(cave):
for fixtype in ["tag point in dataset", "other point in dataset", "exact entrance in dataset (drip line/highest enclosed contour)", "GPS post SA", "GPS pre SA"]:
if(cave[fixtype]):
if cave[fixtype]:
return positions[cave[fixtype]]
return 0
def is_explored(cave):
s = cave["Kat Status Code"]
if(not s): return "<td></td>"
if not s: return "<td></td>"
s = s.replace("(?)","")
if s[-1] == " ": s=s[:-1]
if (not s):
if not s:
print "Rogue space in " + find_effective_number(cave)
return "<td></td>"
code = s[-1]
@ -124,16 +124,16 @@ def findability_color(cave):
def is_underground_surveyed(cave):
s = chomp(cave["Underground drawn survey"])
if(cave["Multiple entrances"] not in ["", "yes"]): return "<td></td>"
if cave["Multiple entrances"] not in ["", "yes"]: return "<td></td>"
if not s:
return "<td class=\"awful\">None</td>"
if s and (s.find("<img") > -1 or s.find("<a") > -1):
if s.find("<img") > -1 or s.find("<a") > -1:
return "<td class=\"good\">Yes</td>"
else:
return "<td class=\"bad\">Missing</td>"
def have_survey_data(cave):
if(cave["Multiple entrances"] not in ["", "yes"]): return "<td></td>"
if cave["Multiple entrances"] not in ["", "yes"]: return "<td></td>"
s = chomp(cave["Underground centre line"])
if s: return "<td class=\"good\">Yes</td>"
s = chomp(cave["Survex file to get length and depth"])
@ -149,11 +149,11 @@ def have_survey_data(cave):
def has_photo(cave):
s = chomp(cave["Photo of location"])
if ((cave["Multiple entrances"] not in ["", "yes"]) and chomp(cave["Autogen file"]) == ""):
if (cave["Multiple entrances"] not in ["", "yes"]) and chomp(cave["Autogen file"]) == "":
return "<td></td>"
if not s:
return "<td class=\"awful\">None</td>"
if s and (s.find("<img") > -1 or s.find("<a") > -1):
if s.find("<img") > -1 or s.find("<a") > -1:
return "<td class=\"good\">Yes</td>"
else:
return "<td class=\"bad\">Missing</td>"
@ -165,7 +165,7 @@ def find_label(cave, number):
else: t += cave["Unofficial Name"]
try:
n = number
if(n[-1] in string.lowercase): n = n[:-1]
if n[-1] in string.lowercase: n = n[:-1]
except:
n = "NONE"
if lengths.has_key(n):
@ -392,7 +392,7 @@ cavestoplot = []
for cave in cavetab:
if cave["Link file"]: continue
number = find_effective_number(cave)
if cave["Multiple entrances"] not in ["", "yes"]):
if cave["Multiple entrances"] not in ["", "yes"]:
number = "&mdash;" + cachednumber + cave["Entrances"]
shortnumber = cachednumber
if not cave["Area"]: cave["Area"] = cachedarea
@ -560,7 +560,7 @@ for area in areas:
htmlfile.write(has_photo(cave))
htmlfile.write(locn)
if(cave["Findability"] != "Surveyed" and cave["Multiple entrances"] != "yes"):
if cave["Findability"] != "Surveyed" and cave["Multiple entrances"] != "yes":
htmlfile.write("<td class=\"locn\">%s %s</td>" % (cave["Location"], cave["Bearings"]))
htmlfile.write("</tr>\n")