diff --git a/apps/common/templates/generic_template.html b/apps/common/templates/generic_template.html index 469cf759db..7a68388c99 100644 --- a/apps/common/templates/generic_template.html +++ b/apps/common/templates/generic_template.html @@ -6,6 +6,10 @@

{{ title }}

{{ content }}

+ + {% for paragraph in paragraphs %} +

{{ paragraph }}

+ {% endfor %}
{% endblock %} diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index 59ae22b374..6490162cda 100755 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -23,6 +23,7 @@ PERMISSION_DOCUMENT_VIEW = 'document_view' PERMISSION_DOCUMENT_DELETE = 'document_delete' PERMISSION_DOCUMENT_DOWNLOAD = 'document_download' PERMISSION_DOCUMENT_TRANSFORM = 'document_transform' +PERMISSION_DOCUMENT_TOOLS = 'document_tools' register_permissions('documents', [ {'name':PERMISSION_DOCUMENT_CREATE, 'label':_(u'Create document')}, @@ -32,6 +33,7 @@ register_permissions('documents', [ {'name':PERMISSION_DOCUMENT_DELETE, 'label':_(u'Delete document')}, {'name':PERMISSION_DOCUMENT_DOWNLOAD, 'label':_(u'Download document')}, {'name':PERMISSION_DOCUMENT_TRANSFORM, 'label':_(u'Transform document')}, + {'name':PERMISSION_DOCUMENT_TOOLS, 'label':_(u'Execute document modifying tools')}, ]) document_list = {'text':_(u'documents list'), 'view':'document_list', 'famfam':'page', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_VIEW]}} @@ -46,6 +48,7 @@ document_preview = {'text':_('preview'), 'class':'fancybox', 'view':'document_pr document_download = {'text':_('download'), 'view':'document_download', 'args':'object.id', 'famfam':'page_save', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_DOWNLOAD]}} document_find_duplicates = {'text':_('find duplicates'), 'view':'document_find_duplicates', 'args':'object.id', 'famfam':'page_refresh', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_VIEW]}} document_find_all_duplicates = {'text':_('find all duplicates'), 'view':'document_find_all_duplicates', 'famfam':'page_refresh', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_VIEW]}} +document_recreate_all_links = {'text':_('recreate index links'), 'view':'document_recreate_all_links', 'famfam':'page_link', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TOOLS]}} document_page_transformation_create = {'text':_('create new transformation'), 'view':'document_page_transformation_create', 'args':'object.id', 'famfam':'pencil_add', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}} document_page_transformation_edit = {'text':_('edit'), 'view':'document_page_transformation_edit', 'args':'object.id', 'famfam':'pencil_go', 'permissions':{'namespace':'documents', 'permissions':[PERMISSION_DOCUMENT_TRANSFORM]}} diff --git a/apps/documents/models.py b/apps/documents/models.py index 89de945b2f..8030ed5ae0 100755 --- a/apps/documents/models.py +++ b/apps/documents/models.py @@ -62,7 +62,7 @@ class Document(models.Model): file_mimetype = models.CharField(max_length=64, default='', editable=False) file_mime_encoding = models.CharField(max_length=64, default='', editable=False) #FAT filename can be up to 255 using LFN - file_filename = models.CharField(max_length=64, default='', editable=False) + file_filename = models.CharField(max_length=255, default='', editable=False) file_extension = models.CharField(max_length=16, default='', editable=False) date_added = models.DateTimeField(verbose_name=_(u'added'), auto_now_add=True) date_updated = models.DateTimeField(verbose_name=_(u'updated'), auto_now=True) @@ -355,7 +355,7 @@ class MetadataIndex(models.Model): class DocumentMetadataIndex(models.Model): document = models.ForeignKey(Document, verbose_name=_(u'document')) metadata_index = models.ForeignKey(MetadataIndex, verbose_name=_(u'metadata index')) - filename = models.CharField(max_length=128, verbose_name=_(u'filename')) + filename = models.CharField(max_length=255, verbose_name=_(u'filename')) suffix = models.PositiveIntegerField(default=0, verbose_name=_(u'suffix')) def __unicode__(self): @@ -381,7 +381,7 @@ class DocumentMetadata(models.Model): class DocumentTypeFilename(models.Model): document_type = models.ForeignKey(DocumentType, verbose_name=_(u'document type')) - filename = models.CharField(max_length=64, verbose_name=_(u'filename')) + filename = models.CharField(max_length=128, verbose_name=_(u'filename')) enabled = models.BooleanField(default=True, verbose_name=_(u'enabled')) def __unicode__(self): diff --git a/apps/documents/urls.py b/apps/documents/urls.py index 6abb2155cc..e418986c77 100755 --- a/apps/documents/urls.py +++ b/apps/documents/urls.py @@ -13,7 +13,6 @@ from converter.api import QUALITY_HIGH urlpatterns = patterns('documents.views', url(r'^document/list/$', 'document_list', (), 'document_list'), - url(r'^document/list/duplicates/$', 'document_find_all_duplicates', (), 'document_find_all_duplicates'), url(r'^document/create/from/local/single/$', 'document_create', {'multiple':False}, 'document_create'), url(r'^document/create/from/local/multiple/$', 'document_create', {'multiple':True}, 'document_create_multiple'), url(r'^document/type/(?P\d+)/upload/single/$', 'upload_document_with_type', {'multiple':False}, 'upload_document_with_type'), @@ -29,6 +28,8 @@ urlpatterns = patterns('documents.views', url(r'^document/(?P\d+)/download/$', 'document_download', (), 'document_download'), url(r'^document/(?P\d+)/create/siblings/$', 'document_create_sibling', {'multiple':True if ENABLE_SINGLE_DOCUMENT_UPLOAD == False else False}, 'document_create_sibling'), url(r'^document/(?P\d+)/find_duplicates/$', 'document_find_duplicates', (), 'document_find_duplicates'), + url(r'^recreate_all_links/$', 'document_recreate_all_links', (), 'document_recreate_all_links'), + url(r'^duplicates/$', 'document_find_all_duplicates', (), 'document_find_all_duplicates'), url(r'^staging_file/(?P\w+)/preview/$', 'staging_file_preview', (), 'staging_file_preview'), url(r'^staging_file/(?P\w+)/delete/$', 'staging_file_delete', (), 'staging_file_delete'), diff --git a/apps/documents/utils.py b/apps/documents/utils.py index 8fc3bec579..df43e50a13 100755 --- a/apps/documents/utils.py +++ b/apps/documents/utils.py @@ -8,7 +8,7 @@ from django.core.exceptions import ObjectDoesNotExist from documents import TEMPORARY_DIRECTORY -from models import DocumentMetadata, MetadataType +from models import Document, DocumentMetadata, MetadataType #http://stackoverflow.com/questions/123198/how-do-i-copy-a-file-in-python def copyfile(source, dest, buffer_size=1024*1024): @@ -112,3 +112,28 @@ def save_metadata(metadata_dict, document): #http://stackoverflow.com/questions/4382875/handling-iri-in-django document_metadata.value=unquote_plus(metadata_dict['value'])#.decode('utf-8') document_metadata.save() + + +def recreate_links(raise_exception=True): + errors = [] + for document in Document.objects.all(): + try: + document.delete_fs_links() + except Exception, e: + print document + if raise_exception: + raise Exception(e) + else: + error.append(e) + + for document in Document.objects.all(): + try: + document.create_fs_links() + except Exception, e: + print document + if raise_exception: + raise Exception(e) + else: + error.append(e) + + return errors diff --git a/apps/documents/views.py b/apps/documents/views.py index a3c3630281..be42381d62 100755 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -21,7 +21,7 @@ from filetransfers.api import serve_file from converter.api import convert, in_image_cache, QUALITY_DEFAULT from converter import TRANFORMATION_CHOICES -from utils import from_descriptor_to_tempfile +from utils import from_descriptor_to_tempfile, recreate_links from models import Document, DocumentMetadata, DocumentType, MetadataType, \ DocumentPage, DocumentPageTransformation @@ -53,7 +53,7 @@ from documents import PERMISSION_DOCUMENT_CREATE, \ PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_PROPERTIES_EDIT, \ PERMISSION_DOCUMENT_METADATA_EDIT, PERMISSION_DOCUMENT_VIEW, \ PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, \ - PERMISSION_DOCUMENT_TRANSFORM + PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS from utils import save_metadata, save_metadata_list, decode_metadata_from_url @@ -743,3 +743,29 @@ def document_find_all_duplicates(request): raise Http404(e) return _find_duplicate_list(request, include_source=False) + + +def document_recreate_all_links(request): + permissions = [PERMISSION_DOCUMENT_TOOLS] + try: + check_permissions(request.user, 'documents', permissions) + except Unauthorized, e: + raise Http404(e) + + previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None))) + next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None))) + + if request.method != 'POST': + return render_to_response('generic_confirm.html', { + 'previous':previous, + 'next':next, + 'message':_(u'On large databases this operation may take some time to execute.'), + }, context_instance=RequestContext(request)) + else: + try: + recreate_links() + messages.success(request, _(u'Filesystem links re-creation completed successfully.')) + except Exception, e: + messages.error(request, _(u'Filesystem links re-creation error: %s') % e) + + return HttpResponseRedirect(next) diff --git a/apps/main/__init__.py b/apps/main/__init__.py index c071262148..f24efbac1c 100755 --- a/apps/main/__init__.py +++ b/apps/main/__init__.py @@ -4,7 +4,7 @@ from common.api import register_menu from permissions import role_list -from documents import document_find_all_duplicates +from documents import document_find_all_duplicates, document_recreate_all_links check_settings = {'text':_(u'settings'), 'view':'check_settings', 'famfam':'cog'} @@ -13,7 +13,7 @@ register_menu([ {'text':_(u'home'), 'view':'home', 'famfam':'house', 'position':0}, {'text':_(u'tools'), 'view':'tools_menu', 'links': [ - document_find_all_duplicates, + document_find_all_duplicates, document_recreate_all_links ],'famfam':'wrench', 'name':'tools','position':7}, {'text':_(u'setup'), 'view':'check_settings', 'links': [ diff --git a/apps/main/views.py b/apps/main/views.py index efeb997b0e..af90c136aa 100755 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -95,6 +95,9 @@ def _exists(path): def blank_menu(request): return render_to_response('generic_template.html', { 'title':_(u'Tools menu'), - 'content':_(u'"Find all duplicates": Search all the documents\' checksums and return a list of the exact matches.') + 'paragraphs':[ + _(u'"Find all duplicates": Search all the documents\' checksums and return a list of the exact matches.'), + _(u'"Recreate index links": Deletes and creates from scratch all the file system indexing links.') + ], }, context_instance=RequestContext(request)) diff --git a/docs/Changelog.txt b/docs/Changelog.txt index e1c30313c1..bbf7096ed2 100644 --- a/docs/Changelog.txt +++ b/docs/Changelog.txt @@ -16,3 +16,4 @@ * Added sentry to monitor and store error for later debugging * Zip files can now be uncompressed in memory and their content uploaded individually in one step * Added per document duplicate search and a tools menu option to seach all duplicated documents +* Added document tool that deletes and re-creates all documents filesystem links diff --git a/docs/TODO b/docs/TODO index 57659f1306..db79335367 100755 --- a/docs/TODO +++ b/docs/TODO @@ -41,6 +41,7 @@ TODO, WISHLIST * Scheduled maintenance (cleanup, deferred OCR's) - DONE * Tesserat default option ocr setup - DONE * Check duplicated files using checksum - DONE +* Link to delete and recreate all document links - DONE * Role editing view under setup - STARTED * Document list filtering by metadata * Filterform date filtering widget @@ -53,7 +54,6 @@ TODO, WISHLIST * Document model's delete method might not get called when deleting in bulk from a queryset * Allow metadata entry form to mix required and non required metadata -* Link to delete and recreate all document links * Versioning support * Generic document anotations using layer overlays * Workflows @@ -83,6 +83,7 @@ TODO, WISHLIST * Restrict view permission free form rename * Add per node max ocr concurrent execution * Skip step 2 of wizard (metadata) if no document type metadata types have been defined +* Add permissions support to menus ISSUES