matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix issue #2

Browse Source
This commit is contained in:
Roberto Rosario
2011-03-07 23:40:49 -04:00
parent bc4c3b6c75
commit b0700c5729
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/ocr/tasks.py
View File

@@ -11,14 +11,10 @@ from literals import QUEUEDOCUMENT_STATE_PENDING, \
from models import QueueDocument, DocumentQueue from models import QueueDocument, DocumentQueue
from ocr.conf.settings import MAX_CONCURRENT_EXECUTION from ocr.conf.settings import MAX_CONCURRENT_EXECUTION
@task()
def do_document_ocr_task(document_id):
document = Document.objects.get(id=document_id)
do_document_ocr(document)
#Disable calling a task from a task to try to fix issue #2
@task() #@task()
def do_queue_document(queue_document_id): def task_process_queue_document(queue_document_id):
queue_document = QueueDocument.objects.get(id=queue_document_id) queue_document = QueueDocument.objects.get(id=queue_document_id)
queue_document.state = QUEUEDOCUMENT_STATE_PROCESSING queue_document.state = QUEUEDOCUMENT_STATE_PROCESSING
queue_document.save() queue_document.save()
@@ -44,7 +40,7 @@ class DocumentQueueWatcher(PeriodicTask):
oldest_queued_document = document_queue.queuedocument_set.filter( oldest_queued_document = document_queue.queuedocument_set.filter(
state=QUEUEDOCUMENT_STATE_PENDING).order_by('datetime_submitted')[0] state=QUEUEDOCUMENT_STATE_PENDING).order_by('datetime_submitted')[0]
do_queue_document(oldest_queued_document.id).delay() task_process_queue_document(oldest_queued_document.id).delay()
except: except:
#No Documents in queue #No Documents in queue
pass pass