diff options
Diffstat (limited to 'parsers/surveys.py')
| -rw-r--r-- | parsers/surveys.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index 29de15c..777e04f 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -95,7 +95,7 @@ def parseSurveyScans(expedition, logfile=None): print(yearFileList) for surveyFolder in yearFileList: try: - surveyNumber=re.match(r'\d\d\d\d#0*(\d+)',surveyFolder).groups() + surveyNumber=re.match(r'\d\d\d\d#(X?)0*(\d+)',surveyFolder).groups() #scanList = listdir(expedition.year, surveyFolder) scanList=os.listdir(os.path.join(yearPath,surveyFolder)) except AttributeError: @@ -116,12 +116,13 @@ def parseSurveyScans(expedition, logfile=None): scanNumber=1 if type(surveyNumber)==types.TupleType: - surveyNumber=surveyNumber[0] + surveyLetter=surveyNumber[0] + surveyNumber=surveyNumber[1] try: placeholder=get_or_create_placeholder(year=int(expedition.year)) - survey=Survey.objects.get_or_create(wallet_number=surveyNumber, expedition=expedition, defaults={'logbook_entry':placeholder})[0] + survey=Survey.objects.get_or_create(wallet_number=surveyNumber, wallet_letter=surveyLetter, expedition=expedition, defaults={'logbook_entry':placeholder})[0] except Survey.MultipleObjectsReturned: - survey=Survey.objects.filter(wallet_number=surveyNumber, expedition=expedition)[0] + survey=Survey.objects.filter(wallet_number=surveyNumber, wallet_letter=surveyLetter, expedition=expedition)[0] file_=os.path.join(yearPath, surveyFolder, scan) scanObj = ScannedImage( file=file_, |