From 26f61523562b718679fd8201f04ad90deefba7a8 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 25 Aug 2017 02:07:58 -0400 Subject: [PATCH] Add "ocr_content" accessor to the DocumentVersion class to return the ocr content. Signed-off-by: Roberto Rosario --- mayan/apps/ocr/apps.py | 4 ++++ mayan/apps/ocr/utils.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 21741b610a..5a03ed267e 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -35,6 +35,7 @@ from .links import ( ) from .permissions import permission_ocr_document, permission_ocr_content_view from .queues import * # NOQA +from .utils import get_document_ocr_content logger = logging.getLogger(__name__) @@ -84,6 +85,9 @@ class OCRApp(MayanAppConfig): DocumentVersionOCRError = self.get_model('DocumentVersionOCRError') Document.add_to_class('submit_for_ocr', document_ocr_submit) + DocumentVersion.add_to_class( + 'ocr_content', get_document_ocr_content + ) DocumentVersion.add_to_class( 'submit_for_ocr', document_version_ocr_submit ) diff --git a/mayan/apps/ocr/utils.py b/mayan/apps/ocr/utils.py index 13724cada7..6af7aa193a 100644 --- a/mayan/apps/ocr/utils.py +++ b/mayan/apps/ocr/utils.py @@ -1,12 +1,15 @@ from __future__ import unicode_literals +from django.apps import apps from django.utils.encoding import force_text from django.utils.html import conditional_escape -from .models import DocumentPageOCRContent - def get_document_ocr_content(document): + DocumentPageOCRContent = apps.get_model( + app_label='ocr', model_name='DocumentPageOCRContent' + ) + for page in document.pages.all(): try: page_content = page.ocr_content.content