diff options
author | Wookey <wookey@wookware.org> | 2019-04-02 00:57:54 +0100 |
---|---|---|
committer | Wookey <wookey@wookware.org> | 2019-04-02 00:57:54 +0100 |
commit | b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80 (patch) | |
tree | 9c6bb4a4530824c8e072984a0346509298188030 /parsers/surveys.py | |
parent | e913a56a6be2e2d90ba0c6f882416acbd8e3e2a2 (diff) | |
parent | 39c61bd526ecaff42650efcd011548aa9dac6900 (diff) | |
download | troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.gz troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.tar.bz2 troggle-b3089fafe99d4fffc9ee96ad1a8d70d0dd242f80.zip |
Merge lots of troggle fixes
Diffstat (limited to 'parsers/surveys.py')
-rw-r--r-- | parsers/surveys.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index 72a05f3..29070e8 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -99,7 +99,7 @@ def parseSurveyScans(expedition, logfile=None): #scanList = listdir(expedition.year, surveyFolder) scanList=os.listdir(os.path.join(yearPath,surveyFolder)) except AttributeError: - print(surveyFolder + " ignored\r",) + print("Folder: " + surveyFolder + " ignored\r") continue for scan in scanList: @@ -107,7 +107,7 @@ def parseSurveyScans(expedition, logfile=None): scanChopped=re.match(r'(?i).*(notes|elev|plan|elevation|extend)(\d*)\.(png|jpg|jpeg)',scan).groups() scanType,scanNumber,scanFormat=scanChopped except AttributeError: - print(scan + " ignored\r",) + print("File: " + scan + " ignored\r") continue if scanType == 'elev' or scanType == 'extend': scanType = 'elevation' |