Issue #75, move OCR queueing from a setting to a DocumentType model field

mayan/apps/ocr/__init__.py

@@ -20,7 +20,6 @@ from .links import (all_document_ocr_cleanup, ocr_tool_link,
                     submit_document_multiple)
 from .models import DocumentQueue
 from .permissions import PERMISSION_OCR_DOCUMENT
-from .settings import AUTOMATIC_OCR
 from .tasks import task_do_ocr
 
 logger = logging.getLogger(__name__)
@@ -42,7 +41,7 @@ def document_post_save(sender, instance, **kwargs):
     logger.debug('received post save signal')
     logger.debug('instance: %s' % instance)
     if kwargs.get('created', False):
-        if AUTOMATIC_OCR:
+        if instance.document.document_type.ocr:
             instance.document.submit_for_ocr()
 
 

mayan/apps/ocr/settings.py

@@ -10,7 +10,6 @@ register_settings(
     settings=[
         {'name': u'TESSERACT_PATH', 'global_name': u'OCR_TESSERACT_PATH', 'default': u'/usr/bin/tesseract', 'exists': True},
         {'name': u'LANGUAGE', 'global_name': u'OCR_LANGUAGE', 'default': u'eng'},
-        {'name': u'AUTOMATIC_OCR', 'global_name': u'OCR_AUTOMATIC_OCR', 'default': True, 'description': _(u'Automatically queue newly created documents for OCR.')},
         {'name': u'UNPAPER_PATH', 'global_name': u'OCR_UNPAPER_PATH', 'default': u'/usr/bin/unpaper', 'description': _(u'File path to unpaper program.'), 'exists': True},
         {'name': u'PDFTOTEXT_PATH', 'global_name': u'OCR_PDFTOTEXT_PATH', 'default': u'/usr/bin/pdftotext', 'description': _(u'File path to poppler\'s pdftotext program used to extract text from PDF files.'), 'exists': True},
         {'name': u'BACKEND', 'global_name': u'OCR_BACKEND', 'default': u'ocr.backends.tesseract.Tesseract', 'description': _(u'Full path to the backend to be used to do OCR.')},