diff options
Diffstat (limited to 'parsers')
| -rw-r--r-- | parsers/survex.py | 8 | ||||
| -rw-r--r-- | parsers/surveys.py | 30 |
2 files changed, 20 insertions, 18 deletions
diff --git a/parsers/survex.py b/parsers/survex.py index 9725ce7..38cae62 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -27,6 +27,8 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): ssto = survexblock.MakeSurvexStation(ls[stardata["to"]]) survexleg = models.SurvexLeg(block=survexblock, stationfrom=ssfrom, stationto=ssto) + # this next fails for two surface survey svx files which use / for decimal point + # e.g. '29/09' in the tape measurement, or use decimals but in brackets, e.g. (06.05) if stardata["type"] == "normal": try: survexleg.tape = float(ls[stardata["tape"]]) @@ -34,7 +36,7 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): print("! Tape misread in", survexblock.survexfile.path) print(" Stardata:", stardata) print(" Line:", ls) - message = ' ! Value Error: line %s in %s' % (ls, survexblock.survexfile.path) + message = ' ! Value Error: Tape misread in line %s in %s' % (ls, survexblock.survexfile.path) models.DataIssue.objects.create(parser='survex', message=message) survexleg.tape = 1000 try: @@ -43,7 +45,7 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): print("! Clino misread in", survexblock.survexfile.path) print(" Stardata:", stardata) print(" Line:", ls) - message = ' ! Value Error: line %s in %s' % (ls, survexblock.survexfile.path) + message = ' ! Value Error: Clino misread in line %s in %s' % (ls, survexblock.survexfile.path) models.DataIssue.objects.create(parser='survex', message=message) lclino = error try: @@ -52,7 +54,7 @@ def LoadSurvexLineLeg(survexblock, stardata, sline, comment, cave): print("! Compass misread in", survexblock.survexfile.path) print(" Stardata:", stardata) print(" Line:", ls) - message = ' ! Value Error: line %s in %s' % (ls, survexblock.survexfile.path) + message = ' ! Value Error: Compass misread in line %s in %s' % (ls, survexblock.survexfile.path) models.DataIssue.objects.create(parser='survex', message=message) lcompass = error if lclino == "up": diff --git a/parsers/surveys.py b/parsers/surveys.py index ec6298c..942c0a5 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -82,14 +82,14 @@ def get_or_create_placeholder(year): # logging.info("added survey " + survey[header['Year']] + "#" + surveyobj.wallet_number + "\r") # dead -def listdir(*directories): - try: - return os.listdir(os.path.join(settings.SURVEYS, *directories)) - except: - import urllib.request, urllib.parse, urllib.error - url = settings.SURVEYS + reduce(lambda x, y: x + "/" + y, ["listdir"] + list(directories)) - folders = urllib.request.urlopen(url.replace("#", "%23")).readlines() - return [folder.rstrip(r"/") for folder in folders] +# def listdir(*directories): + # try: + # return os.listdir(os.path.join(settings.SURVEYS, *directories)) + # except: + # import urllib.request, urllib.parse, urllib.error + # url = settings.SURVEYS + reduce(lambda x, y: x + "/" + y, ["listdir"] + list(directories)) + # folders = urllib.request.urlopen(url.replace("#", "%23")).readlines() + # return [folder.rstrip(r"/") for folder in folders] # add survey scans # def parseSurveyScans(expedition, logfile=None): @@ -171,13 +171,13 @@ def listdir(*directories): # parseSurveyScans(expedition) # dead -def isInterlacedPNG(filePath): #We need to check for interlaced PNGs because the thumbnail engine can't handle them (uses PIL) - file=Image.open(filePath) - print(filePath) - if 'interlace' in file.info: - return file.info['interlace'] - else: - return False +# def isInterlacedPNG(filePath): #We need to check for interlaced PNGs because the thumbnail engine can't handle them (uses PIL) + # file=Image.open(filePath) + # print(filePath) + # if 'interlace' in file.info: + # return file.info['interlace'] + # else: + # return False # handles url or file, so we can refer to a set of scans on another server |