Merge branch 'new_metadata'

Conflicts:
	requirements/development.txt
	requirements/production.txt
	settings.py

apps/ocr/api.py

@@ -111,6 +111,7 @@ def do_document_ocr(document):
             f.close()
             cleanup(ocr_output)
         finally:
+            os.close(desc)
             cleanup(filepath)
             if imagefile:
                 cleanup(imagefile)

apps/ocr/tasks.py

@@ -28,7 +28,7 @@ if CACHE_URI:
         cache_backend = get_cache(CACHE_URI)
     except ImportError:
         # TODO: display or log error
-        cache_backend = None        
+        cache_backend = None
 else:
     cache_backend = None
 
@@ -95,7 +95,7 @@ def task_process_document_queues():
 
     # reset_orphans()
     # Causes problems with big clusters increased latency
-    # Disabled until better solution 
+    # Disabled until better solution
     q_pending = Q(state=QUEUEDOCUMENT_STATE_PENDING)
     q_delayed = Q(delay=True)
     q_delay_interval = Q(datetime_submitted__lt=datetime.now() - timedelta(seconds=REPLICATION_DELAY))

apps/ocr/views.py

@@ -103,7 +103,8 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
     context = {
         'next': next,
         'previous': previous,
-        'delete_view': True
+        'delete_view': True,
+        'form_icon': u'hourglass_delete.png',
     }
 
     if len(queue_documents) == 1:
@@ -260,6 +261,7 @@ def all_document_ocr_cleanup(request):
             'previous': previous,
             'next': next,
             'message': _(u'On large databases this operation may take some time to execute.'),
+            'form_icon': u'text_strikethroungh.png',
         }, context_instance=RequestContext(request))
     else:
         try: