Document upload and metadata input working
This commit is contained in:
40
apps/common/utils.py
Normal file
40
apps/common/utils.py
Normal file
@@ -0,0 +1,40 @@
|
||||
from django.utils.http import urlquote as django_urlquote
|
||||
from django.utils.http import urlencode as django_urlencode
|
||||
from django.utils.datastructures import MultiValueDict
|
||||
|
||||
def urlquote(link=None, get={}):
|
||||
u'''
|
||||
This method does both: urlquote() and urlencode()
|
||||
|
||||
urlqoute(): Quote special characters in 'link'
|
||||
|
||||
urlencode(): Map dictionary to query string key=value&...
|
||||
|
||||
HTML escaping is not done.
|
||||
|
||||
Example:
|
||||
|
||||
urlquote('/wiki/Python_(programming_language)') --> '/wiki/Python_%28programming_language%29'
|
||||
urlquote('/mypath/', {'key': 'value'}) --> '/mypath/?key=value'
|
||||
urlquote('/mypath/', {'key': ['value1', 'value2']}) --> '/mypath/?key=value1&key=value2'
|
||||
urlquote({'key': ['value1', 'value2']}) --> 'key=value1&key=value2'
|
||||
'''
|
||||
assert link or get
|
||||
if isinstance(link, dict):
|
||||
# urlqoute({'key': 'value', 'key2': 'value2'}) --> key=value&key2=value2
|
||||
assert not get, get
|
||||
get=link
|
||||
link=''
|
||||
assert isinstance(get, dict), 'wrong type "%s", dict required' % type(get)
|
||||
#assert not (link.startswith('http://') or link.startswith('https://')), \
|
||||
# 'This method should only quote the url path. It should not start with http(s):// (%s)' % (
|
||||
# link)
|
||||
if get:
|
||||
# http://code.djangoproject.com/ticket/9089
|
||||
if isinstance(get, MultiValueDict):
|
||||
get=get.lists()
|
||||
if link:
|
||||
link='%s?' % django_urlquote(link)
|
||||
return u'%s%s' % (link, django_urlencode(get, doseq=True))
|
||||
else:
|
||||
return django_urlquote(link)
|
||||
Reference in New Issue
Block a user