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

Added OCR multi document re-queue support

Browse Source
This commit is contained in:
Roberto Rosario
2011-03-21 16:19:19 -04:00
parent bbcc0ead65
commit bef40d958e
3 changed files with 55 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/ocr/__init__.py
View File

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext
from django.db.utils import DatabaseError
from common.api import register_links, register_menu
from common.api import register_links, register_menu, register_multi_item_links
from permissions.api import register_permissions
from documents.models import Document
@@ -28,6 +28,7 @@ register_permissions('ocr', [
#Links
submit_document = {'text':_('submit to OCR queue'), 'view':'submit_document', 'args':'object.id', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}}
re_queue_document = {'text':_('re-queue'), 'view':'re_queue_document', 'args':'object.id', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}}
re_queue_multiple_document = {'text':_('re-queue'), 'view':'re_queue_multiple_document', 'famfam':'hourglass_add', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT]}}
queue_document_delete = {'text':_(u'delete'), 'view':'queue_document_delete', 'args':'object.id', 'famfam':'hourglass_delete', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_DOCUMENT_DELETE]}}
document_queue_disable = {'text':_(u'stop queue'), 'view':'document_queue_disable', 'args':'object.id', 'famfam':'control_stop_blue', 'permissions':{'namespace':'ocr', 'permissions':[PERMISSION_OCR_QUEUE_ENABLE_DISABLE]}}
@@ -37,6 +38,8 @@ register_links(Document, [submit_document], menu_name='sidebar')
register_links(DocumentQueue, [document_queue_disable, document_queue_enable])
register_links(QueueDocument, [re_queue_document, queue_document_delete])
register_multi_item_links(['queue_document_list'], [re_queue_multiple_document])
#Menus
register_menu([
{'text':_('OCR'), 'view':'queue_document_list', 'links':[

3
apps/ocr/urls.py
View File

@@ -6,7 +6,8 @@ urlpatterns = patterns('ocr.views',
url(r'^ocr/queue/document/list/$', 'queue_document_list', (), 'queue_document_list'),
url(r'^ocr/queue/document/(?P<queue_document_id>\d+)/delete/$', 'queue_document_delete', (), 'queue_document_delete'),
url(r'^ocr/queue/document/(?P<queue_document_id>\d+)/re-queue/$', 're_queue_document', (), 're_queue_document'),
url(r'^ocr/queue/document/multiple/re-queue/$', 're_queue_multiple_document', (), 're_queue_multiple_document'),
url(r'^ocr/queue/(?P<document_queue_id>\d+)/enable/$', 'document_queue_enable', (), 'document_queue_enable'),
url(r'^ocr/queue/(?P<document_queue_id>\d+)/disable/$', 'document_queue_disable', (), 'document_queue_disable'),
)

77
apps/ocr/views.py
View File

@@ -52,6 +52,7 @@ def queue_document_list(request, queue_name='default'):
{'name':'state', 'attribute': lambda x: x.get_state_display()},
{'name':'result', 'attribute':'result'},
],
'multi_select_as_buttons':True,
'sidebar_subtemplates_list':[
{
'title':_(u'document queue properties'),
@@ -104,47 +105,67 @@ def submit_document_to_queue(request, document, post_submit_redirect=None):
return HttpResponseRedirect(post_submit_redirect)
def re_queue_document(request, queue_document_id):
def re_queue_document(request, queue_document_id=None, queue_document_id_list=[]):
check_permissions(request.user, 'ocr', [PERMISSION_OCR_DOCUMENT])
if queue_document_id:
queue_documents = [get_object_or_404(QueueDocument, pk=queue_document_id)]
post_redirect = None
elif queue_document_id_list:
queue_documents = [get_object_or_404(QueueDocument, pk=queue_document_id) for queue_document_id in queue_document_id_list.split(',')]
post_redirect = None
else:
messages.error(request, _(u'Must provide at least one queue document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
queue_document = get_object_or_404(QueueDocument, pk=queue_document_id)
try:
queue_document.document
except Document.DoesNotExist:
messages.error(request, _(u'This document no longer exists.'))
return HttpResponseRedirect(previous)
for queue_document in queue_documents:
try:
queue_document.document
except Document.DoesNotExist:
messages.error(request, _(u'Document id#: %d, no longer exists.') % queue_document.document_id)
return HttpResponseRedirect(previous)
if queue_document.state == QUEUEDOCUMENT_STATE_PENDING:
messages.warning(request, _(u'This document is already queued and pending processing.'))
return HttpResponseRedirect(previous)
elif queue_document.state == QUEUEDOCUMENT_STATE_PROCESSING:
messages.warning(request, _(u'This document is already being processed and can\'t be re-queded.'))
return HttpResponseRedirect(previous)
if queue_document.state == QUEUEDOCUMENT_STATE_PENDING:
messages.warning(request, _(u'Document: %s is already queued and pending processing.') % queue_document)
return HttpResponseRedirect(previous)
elif queue_document.state == QUEUEDOCUMENT_STATE_PROCESSING:
messages.warning(request, _(u'Document: %s is already being processed and can\'t be re-queded.') % queue_document)
return HttpResponseRedirect(previous)
if request.method == 'POST':
try:
if queue_document.state == QUEUEDOCUMENT_STATE_ERROR:
queue_document.datetime_submitted = datetime.datetime.now()
queue_document.state = QUEUEDOCUMENT_STATE_PENDING
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})
for queue_document in queue_documents:
try:
if queue_document.state == QUEUEDOCUMENT_STATE_ERROR:
queue_document.datetime_submitted = datetime.datetime.now()
queue_document.state = QUEUEDOCUMENT_STATE_PENDING
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})
except Exception, e:
messages.error(request, e)
except Exception, e:
messages.error(request, e)
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'object':queue_document,
'title':_(u'Are you sure you wish to re-queue document: %s') % queue_document,
context = {
'next':next,
'previous':previous,
}, context_instance=RequestContext(request))
}
if len(queue_documents) == 1:
context['object'] = queue_documents[0]
context['title'] = _(u'Are you sure you with to re-queue document: %s?') % ', '.join([unicode(d) for d in queue_documents])
elif len(queue_documents) > 1:
context['title'] = _(u'Are you sure you with to re-queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents])
return render_to_response('generic_confirm.html', context,
context_instance=RequestContext(request))
def re_queue_multiple_document(request):
return re_queue_document(request, queue_document_id_list=request.GET.get('id_list', []))
def document_queue_disable(request, document_queue_id):