Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 11:37:08 +00:00
Code Issues Packages Projects Releases Activity

Make P1 imports not fail if called needlessly.

Browse Source 
If their respective configuration keys are not
defined in a survey configuration, the import
routines will print an informational message
and exit successfully.
This commit is contained in:
D. Berge
2020-08-24 19:45:59 +02:00
parent 721dae4084
commit bc784989f6
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/import_final_p111.py
View File

@@ -30,7 +30,12 @@ if __name__ == '__main__':
db.set_survey(survey["schema"]) db.set_survey(survey["schema"])
try:
final_p111 = survey["final"]["p111"] final_p111 = survey["final"]["p111"]
except KeyError:
print("No final P1/11 configuration")
exit(0)
pattern = final_p111["pattern"] pattern = final_p111["pattern"]
rx = re.compile(pattern["regex"]) rx = re.compile(pattern["regex"])

5
bin/import_final_p190.py
View File

@@ -30,7 +30,12 @@ if __name__ == '__main__':
db.set_survey(survey["schema"]) db.set_survey(survey["schema"])
try:
final_p190 = survey["final"]["p190"] final_p190 = survey["final"]["p190"]
except KeyError:
print("No final P1/90 configuration")
exit(0)
pattern = final_p190["pattern"] pattern = final_p190["pattern"]
rx = re.compile(pattern["regex"]) rx = re.compile(pattern["regex"])

5
bin/import_raw_p111.py
View File

@@ -30,7 +30,12 @@ if __name__ == '__main__':
db.set_survey(survey["schema"]) db.set_survey(survey["schema"])
try:
raw_p111 = survey["raw"]["p111"] raw_p111 = survey["raw"]["p111"]
except KeyError:
print("No raw P1/11 configuration")
exit(0)
pattern = raw_p111["pattern"] pattern = raw_p111["pattern"]
rx = re.compile(pattern["regex"]) rx = re.compile(pattern["regex"])

5
bin/import_raw_p190.py
View File

@@ -30,7 +30,12 @@ if __name__ == '__main__':
db.set_survey(survey["schema"]) db.set_survey(survey["schema"])
try:
raw_p190 = survey["raw"]["p190"] raw_p190 = survey["raw"]["p190"]
except KeyError:
print("No raw P1/90 configuration")
exit(0)
pattern = raw_p190["pattern"] pattern = raw_p190["pattern"]
rx = re.compile(pattern["regex"]) rx = re.compile(pattern["regex"])