diff options
| author | Sam Wenham <sam@wenhams.co.uk> | 2019-02-24 14:29:14 +0000 |
|---|---|---|
| committer | Sam Wenham <sam@wenhams.co.uk> | 2019-02-24 14:29:14 +0000 |
| commit | f16b4e3f47a5a7e3103d9e6278462b1e86e67b30 (patch) | |
| tree | b6ec5e9765be6f1299cccb8d52ee07eb37c2ab02 /databaseReset.py | |
| parent | 4ad5b684333bfb995160cd6bf00308d9f3839d4a (diff) | |
| download | troggle-f16b4e3f47a5a7e3103d9e6278462b1e86e67b30.tar.gz troggle-f16b4e3f47a5a7e3103d9e6278462b1e86e67b30.tar.bz2 troggle-f16b4e3f47a5a7e3103d9e6278462b1e86e67b30.zip | |
Make the suryeys importer not explode
Diffstat (limited to 'databaseReset.py')
| -rw-r--r-- | databaseReset.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/databaseReset.py b/databaseReset.py index edc7db9..f17d3e5 100644 --- a/databaseReset.py +++ b/databaseReset.py @@ -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: |