sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Patrick Jentsch 2019-07-11 09:40:37 +02:00
commit b82ab23079
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/scheduler/views.py
View File

@ -25,8 +25,13 @@ def scheduler():
def process_job(job): def process_job(job):
<<<<<<< HEAD
input_dir = '/home/pjentsch/%s/input' % job['service'] input_dir = '/home/pjentsch/%s/input' % job['service']
output_dir = '/home/pjentsch/%s/output' % job['service'] output_dir = '/home/pjentsch/%s/output' % job['service']
=======
input_dir = '/home/pjentsch/ocr/input'
output_dir = '/home/pjentsch/ocr/output'
>>>>>>> e6446834b4c4251154497a7104cd84d1188be981
job['status'] = 'running' job['status'] = 'running'
print('### Job status changed ###') print('### Job status changed ###')