From a11d274d16d353503868158dc56164ca4e6c76e2 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 25 Aug 2017 02:08:29 -0400 Subject: [PATCH] Add the "content" accessor to the DocumentVersion model to return the parsed content. Signed-off-by: Roberto Rosario --- mayan/apps/document_parsing/apps.py | 4 ++++ mayan/apps/document_parsing/utils.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py index d65953daf7..8f30685a9f 100644 --- a/mayan/apps/document_parsing/apps.py +++ b/mayan/apps/document_parsing/apps.py @@ -30,6 +30,7 @@ from .links import ( link_document_submit, link_document_type_submit, link_error_list ) from .permissions import permission_content_view +from .utils import get_document_content logger = logging.getLogger(__name__) @@ -75,6 +76,9 @@ class DocumentParsingApp(MayanAppConfig): DocumentVersionParseError = self.get_model('DocumentVersionParseError') Document.add_to_class('submit_for_parsing', document_parsing_submit) + DocumentVersion.add_to_class( + 'content', get_document_content + ) DocumentVersion.add_to_class( 'submit_for_parsing', document_version_parsing_submit ) diff --git a/mayan/apps/document_parsing/utils.py b/mayan/apps/document_parsing/utils.py index bbb498af20..ab8e049450 100644 --- a/mayan/apps/document_parsing/utils.py +++ b/mayan/apps/document_parsing/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 DocumentPageContent - def get_document_content(document): + DocumentPageContent = apps.get_model( + app_label='document_parsing', model_name='DocumentPageContent' + ) + for page in document.pages.all(): try: page_content = page.content.content