Added OCR capabilites

This commit is contained in:
Roberto Rosario
2011-02-09 02:12:14 -04:00
parent 52bee20025
commit 6569faad11
21 changed files with 249 additions and 18 deletions
+6
View File
@@ -1,3 +1,5 @@
import tempfile
from django.utils.translation import ugettext_lazy as _
from common.api import register_links, register_menu
@@ -5,6 +7,9 @@ from common.api import register_links, register_menu
from models import Document
from staging import StagingFile
from documents.conf import settings as documents_settings
document_list = {'text':_(u'documents list'), 'view':'document_list', 'famfam':'page'}
document_create = {'text':_('upload a document'), 'view':'document_create', 'famfam':'page_add'}
document_create_multiple = {'text':_('upload multiple documents'), 'view':'document_create_multiple', 'famfam':'page_add'}
@@ -28,3 +33,4 @@ register_menu([
document_list
],'famfam':'page','position':4}])
TEMPORARY_DIRECTORY = documents_settings.TEMPORARY_DIRECTORY if documents_settings.TEMPORARY_DIRECTORY else tempfile.mkdtemp()
+8 -2
View File
@@ -2,7 +2,7 @@ from django.contrib import admin
from models import MetadataType, DocumentType, Document, \
DocumentTypeMetadataType, DocumentMetadata, DocumentTypeFilename, \
MetadataIndex, DocumentMetadataIndex
MetadataIndex, DocumentMetadataIndex, DocumentPage
class MetadataTypeAdmin(admin.ModelAdmin):
@@ -49,9 +49,15 @@ class DocumentMetadataIndexInline(admin.StackedInline):
allow_add = True
readonly_fields = ('metadata_index', 'filename')
class DocumentPageInline(admin.StackedInline):
model = DocumentPage
extra = 1
classes = ('collapse-open',)
allow_add = True
class DocumentAdmin(admin.ModelAdmin):
inlines = [DocumentMetadataInline, DocumentMetadataIndexInline]
inlines = [DocumentMetadataInline, DocumentMetadataIndexInline, DocumentPageInline]
list_display = ('uuid', 'file_filename', 'file_extension')
+2
View File
@@ -40,3 +40,5 @@ FILESYSTEM_SLUGIFY_PATHS = getattr(settings, 'DOCUMENTS_SLUGIFY_PATHS', False)
FILESYSTEM_MAX_RENAME_COUNT = getattr(settings, 'DOCUMENTS_FILESYSTEM_MAX_RENAME_COUNT', 200)
#misc
TEMPORARY_DIRECTORY = getattr(settings, 'DOCUMENTS_TEMPORARY_DIRECTORY', u'/tmp')
+1
View File
@@ -35,6 +35,7 @@ class DocumentForm(forms.ModelForm):
class Meta:
model = Document
exclude = ('description',)
class DocumentForm_view(DetailForm):
+18 -3
View File
@@ -65,6 +65,7 @@ class Document(models.Model):
date_added = models.DateTimeField(verbose_name=_(u'added'), auto_now_add=True)
date_updated = models.DateTimeField(verbose_name=_(u'updated'), auto_now=True)
checksum = models.TextField(blank=True, null=True, verbose_name=_(u'checksum'), editable=False)
description = models.TextField(blank=True, null=True, verbose_name=_(u'description'))
class Meta:
verbose_name = _(u'document')
@@ -98,7 +99,7 @@ class Document(models.Model):
#topics/db/queries.html#topics-db-queries-delete
self.delete_fs_links()
super(Document, self).delete(*args, **kwargs)
def create_fs_links(self):
if FILESYSTEM_FILESERVING_ENABLE:
metadata_dict = {'document':self}
@@ -292,6 +293,20 @@ class DocumentTypeFilename(models.Model):
ordering = ['filename']
verbose_name = _(u'document type filename')
verbose_name_plural = _(u'document types filenames')
register(Document, _(u'document'), ['document_type__name', 'file_mimetype', 'file_filename', 'file_extension', 'documentmetadata__value'])
class DocumentPage(models.Model):
document = models.ForeignKey(Document, verbose_name=_(u'document'))
content = models.TextField(blank=True, null=True, verbose_name=_(u'content'))
page_label = models.CharField(max_length=32, blank=True, null=True, verbose_name=_(u'page label'))
page_number = models.PositiveIntegerField(default=0, verbose_name=_(u'page number'))
def __unicode__(self):
return '%s - %s' % (self.page_number, self.page_label)
class Meta:
verbose_name = _(u'document page')
verbose_name_plural = _(u'document pages')
register(Document, _(u'document'), ['document_type__name', 'file_mimetype', 'file_filename', 'file_extension', 'documentmetadata__value', 'documentpage__content'])
+1 -1
View File
@@ -1,7 +1,7 @@
import os
import tempfile
from documents.conf.settings import TEMPORARY_DIRECTORY
from documents import TEMPORARY_DIRECTORY
#http://stackoverflow.com/questions/123198/how-do-i-copy-a-file-in-python
+2 -3
View File
@@ -292,7 +292,6 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE):
desc = document.file.storage.open(document.file.path)
filepath = from_descriptor_to_tempfile(desc, document.uuid)
output_file = convert(filepath, size)
print document_id, output_file
return serve_file(request, File(file=open(output_file, 'r')))
except Exception, e:
if size == THUMBNAIL_SIZE:
@@ -328,5 +327,5 @@ def staging_file_preview(request, staging_file_id):
output_file = convert(filepath, STAGING_FILES_PREVIEW_SIZE)
return serve_file(request, File(file=open(output_file, 'r')))
except Exception, e:
#messages.error(request, e)
return HttpResponse('')
return serve_file(request, File(file=open('%simages/1297211435_error.png' % settings.MEDIA_ROOT, 'r')))