matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improved zoom detection from url hack

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-21 23:18:57 -04:00
parent dc08f96414
commit dc4075d97d
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/documents/views.py
+22 -16
View File
@@ -550,13 +550,20 @@ def get_document_image(request, document_id, size=PREVIEW_SIZE, quality=QUALITY_
if zoom > 200: if zoom > 200:
zoom = 200 zoom = 200
if zoom < 1:
zoom = 1
rotation = int(request.GET.get('rotation', 0))
if rotation > 360 or rotation < 0:
rotation %= 360
try: try:
filepath = in_image_cache(document.checksum, size=size, quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom) filepath = in_image_cache(document.checksum, size=size, quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
if filepath: if filepath:
return sendfile.sendfile(request, filename=filepath) return sendfile.sendfile(request, filename=filepath)
#Save to a temporary location #Save to a temporary location
filepath = document_save_to_temp_dir(document, filename=document.checksum) filepath = document_save_to_temp_dir(document, filename=document.checksum)
output_file = convert(filepath, size=size, format='jpg', quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom) output_file = convert(filepath, size=size, format='jpg', quality=quality, extra_options=tranformation_string, page=page - 1, zoom=zoom, rotation=rotation)
return sendfile.sendfile(request, filename=output_file) return sendfile.sendfile(request, filename=output_file)
except UnkownConvertError, e: except UnkownConvertError, e:
if request.user.is_staff or request.user.is_superuser: if request.user.is_staff or request.user.is_superuser:
@@ -900,7 +907,8 @@ def document_page_view(request, document_page_id):
document_page = get_object_or_404(DocumentPage, pk=document_page_id) document_page = get_object_or_404(DocumentPage, pk=document_page_id)
zoom = int(request.GET.get('zoom', 100)) zoom = int(request.GET.get('zoom', 100))
document_page_form = DocumentPageForm(instance=document_page, zoom=zoom) rotation = int(request.GET.get('rotation', 0))
document_page_form = DocumentPageForm(instance=document_page, zoom=zoom, rotation=rotation)
form_list = [ form_list = [
{ {
@@ -1018,12 +1026,11 @@ def document_page_zoom_in(request, document_page_id):
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).path)
document_page = get_object_or_404(DocumentPage, pk=document_page_id) document_page = get_object_or_404(DocumentPage, pk=document_page_id)
#TODO: Improve this hack # Get the query string from the referer url
query = urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).query.split(u'=') query = urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).query
try: # Parse the query string and get the zoom value
zoom = int(query[1]) # parse_qs return a dictionary whose values are lists
except: zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0])
zoom = 100
zoom += 50 zoom += 50
if zoom > 200: if zoom > 200:
zoom = 200 zoom = 200
@@ -1036,14 +1043,13 @@ def document_page_zoom_out(request, document_page_id):
view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).path) view = resolve_to_name(urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).path)
document_page = get_object_or_404(DocumentPage, pk=document_page_id) document_page = get_object_or_404(DocumentPage, pk=document_page_id)
#TODO: Improve this hack # Get the query string from the referer url
query = urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).query.split(u'=') query = urlparse.urlparse(request.META.get('HTTP_REFERER', '/')).query
try: # Parse the query string and get the zoom value
zoom = int(query[1]) # parse_qs return a dictionary whose values are lists
except: zoom = int(urlparse.parse_qs(query).get('zoom', ['100'])[0])
zoom = 100
zoom -= 50 zoom -= 50
if zoom <50: if zoom < 50:
zoom = 50 zoom = 50
return HttpResponseRedirect(reverse(view, args=[document_page.pk]) + u'?zoom=%s' % zoom) return HttpResponseRedirect(reverse(view, args=[document_page.pk]) + u'?zoom=%s' % zoom)