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

Move OCR queue document requeueing from the view to the model and add proper exception

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-01 04:47:27 -04:00
parent 31ea558b60
commit c63721cbf6
3 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
apps/ocr/views.py
View File

@@ -1,4 +1,3 @@
import datetime
import socket
from django.http import HttpResponseRedirect
@@ -23,7 +22,7 @@ from ocr.models import DocumentQueue, QueueDocument, QueueTransformation
from ocr.literals import QUEUEDOCUMENT_STATE_PENDING, \
QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_STOPPED, \
DOCUMENTQUEUE_STATE_ACTIVE
from ocr.exceptions import AlreadyQueued
from ocr.exceptions import AlreadyQueued, ReQueueError
from ocr.api import clean_pages
from ocr.forms import QueueTransformationForm, QueueTransformationForm_create
@@ -122,7 +121,7 @@ def submit_document_multiple(request):
for item_id in request.GET.get('id_list', '').split(','):
submit_document(request, item_id)
return HttpResponseRedirect(request.META['HTTP_REFERER'])
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
def submit_document(request, document_id):
@@ -130,7 +129,7 @@ def submit_document(request, document_id):
document = get_object_or_404(Document, pk=document_id)
return submit_document_to_queue(request, document=document,
post_submit_redirect=request.META['HTTP_REFERER'])
post_submit_redirect=request.META.get('HTTP_REFERER', '/'))
def submit_document_to_queue(request, document, post_submit_redirect=None):
@@ -167,22 +166,21 @@ def re_queue_document(request, queue_document_id=None, queue_document_id_list=No
if request.method == 'POST':
for queue_document in queue_documents:
try:
queue_document.document
if queue_document.state == QUEUEDOCUMENT_STATE_PROCESSING:
messages.warning(request, _(u'Document: %s is already being processed and can\'t be re-queded.') % queue_document)
else:
queue_document.datetime_submitted = datetime.datetime.now()
queue_document.state = QUEUEDOCUMENT_STATE_PENDING
queue_document.delay = False
queue_document.result = None
queue_document.node_name = None
queue_document.save()
messages.success(request, _(u'Document: %(document)s was re-queued to the OCR queue: %(queue)s') % {
'document': queue_document.document, 'queue': queue_document.document_queue.label})
queue_document.requeue()
messages.success(
request,
_(u'Document: %(document)s was re-queued to the OCR queue: %(queue)s') % {
'document': queue_document.document,
'queue': queue_document.document_queue.label
}
)
except Document.DoesNotExist:
messages.error(request, _(u'Document id#: %d, no longer exists.') % queue_document.document_id)
except Exception, e:
messages.error(request, e)
except ReQueueError:
messages.warning(
request,
_(u'Document: %s is already being processed and can\'t be re-queded.') % queue_document
)
return HttpResponseRedirect(next)
context = {