expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-14 19:27:11 +00:00
Code Issues 18 Projects 3 Activity

Make the suryeys importer not explode

Browse Source
This commit is contained in:
Sam Wenham
2019-02-24 14:29:14 +00:00
parent 4ad5b68433
commit f16b4e3f47
3 changed files with 68 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
databaseReset.py
View File

@@ -22,7 +22,7 @@ def reload_db():
os.remove(databasename)
except OSError:
pass
else:
else:
cursor = connection.cursor()
cursor.execute("DROP DATABASE %s" % databasename)
cursor.execute("CREATE DATABASE %s" % databasename)
@@ -115,7 +115,7 @@ def import_auto_logbooks():
"autologbook")
for root, dirs, filenames in os.walk(directory):
for filename in filenames:
print os.path.join(root, filename)
print(os.path.join(root, filename))
parsers.logbooks.parseAutoLogBookEntry(os.path.join(root, filename))
#Temporary function until definative source of data transfered.
@@ -138,7 +138,7 @@ def dumplogbooks():
filename = os.path.join(directory,
dateStr + "." + slugify(lbe.title)[:50] + ".html")
if lbe.cave:
print lbe.cave.reference()
print(lbe.cave.reference())
trip = {"title": lbe.title, "html":lbe.text, "cave": lbe.cave.reference(), "caveOrLocation": "cave"}
else:
trip = {"title": lbe.title, "html":lbe.text, "location":lbe.place, "caveOrLocation": "location"}
@@ -180,6 +180,7 @@ def usage():
scans - read in the scanned surveynotes
survex - read in the survex files
survexpos
surveys
tunnel - read in the Tunnel files
writeCaves
""")
@@ -212,7 +213,7 @@ if __name__ == "__main__":
try:
import_tunnelfiles()
except:
print "Tunnel files parser broken."
print("Tunnel files parser broken.")
import_surveys()
import_descriptions()
parse_descriptions()
@@ -232,6 +233,8 @@ if __name__ == "__main__":
dumplogbooks()
elif "writeCaves" in sys.argv:
writeCaves()
elif "surveys" in sys.argv:
import_surveys()
elif "help" in sys.argv:
usage()
else: