mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development
This commit is contained in:
		@@ -25,8 +25,13 @@ def scheduler():
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def process_job(job):
 | 
			
		||||
<<<<<<< HEAD
 | 
			
		||||
    input_dir = '/home/pjentsch/%s/input' % 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'
 | 
			
		||||
    print('### Job status changed ###')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user