diff --git a/databaseReset.py b/databaseReset.py index 8f00a7f..e97773c 100755 --- a/databaseReset.py +++ b/databaseReset.py @@ -380,7 +380,7 @@ def usage(): QMs - read in the QM csv files (older caves only) scans - the survey scans in all the wallets (must run before survex) survex - read in the survex files - all the survex blocks but not the x/y/z positions - survexpos - just the x/y/z Pos out of the survex files + survexpos - just the x/y/z Pos out of the survex files - Never used. tunnel - read in the Tunnel files - which scans the survey scans too @@ -436,7 +436,7 @@ if __name__ == "__main__": jq.enq("logbooks",import_logbooks) jq.enq("QMs",import_QMs) jq.enq("survexblks",import_survexblks) - jq.enq("survexpos",import_survexpos) + #jq.enq("survexpos",import_survexpos) jq.enq("tunnel",import_tunnelfiles) elif "scans" in sys.argv: jq.enq("scans",import_surveyscans) diff --git a/parsers/caves.py b/parsers/caves.py old mode 100644 new mode 100755 index 4f65675..7e03835 --- a/parsers/caves.py +++ b/parsers/caves.py @@ -170,6 +170,7 @@ def readcave(filename): def getXML(text, itemname, minItems = 1, maxItems = None, printwarnings = True, context = ""): + # this next line is where it crashes horribly if a stray umlaut creeps in. Will fix itself in python3 items = re.findall("<%(itemname)s>(.*?)" % {"itemname": itemname}, text, re.S) if len(items) < minItems and printwarnings: message = " ! %(count)i %(itemname)s found, at least %(min)i expected" % {"count": len(items),