summaryrefslogtreecommitdiff
path: root/chimere/main/views.py
diff options
context:
space:
mode:
Diffstat (limited to 'chimere/main/views.py')
-rw-r--r--chimere/main/views.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/chimere/main/views.py b/chimere/main/views.py
index 0707caa..593331a 100644
--- a/chimere/main/views.py
+++ b/chimere/main/views.py
@@ -240,10 +240,16 @@ def getDetail(request, area_name, marker_id):
return HttpResponse('no results')
response_dct = get_base_response()
response_dct['marker'] = marker
- response_dct['share_networks'] = settings.SHARE_NETWORKS
if request.method == 'GET':
if 'simple' in request.GET and request.GET['simple']:
response_dct['simple'] = True
+ parameters = u'current_feature=' + marker_id
+ net_dct = getTinyfiedUrl(parameters, area_name)
+ share_networks = []
+ for network in settings.SHARE_NETWORKS:
+ share_networks.append((network[0], network[1] % net_dct, network[2]))
+ response_dct['share_networks'] = share_networks
+ print response_dct
return render_to_response('detail.html', response_dct)
def getDescriptionDetail(request, area_name, category_id):
@@ -328,14 +334,15 @@ def getAvailableCategories(request, area_name=None, area=None, status='A', force
response_dct['sub_categories'] = subcategories
return render_to_response('categories.html', response_dct)
-def getTinyfiedUrl(request, area_name='', parameters=''):
+def getTinyfiedUrl(parameters, area_name=''):
'''
Get the tinyfied version of parameters
'''
+ data = {"urn": "", "url":"", "text":""}
try:
urn = TinyUrl.getUrnByParameters(parameters)
except:
- return HttpResponse('no results')
+ return {}
response_dct = get_base_response(area_name)
url = settings.SERVER_URL
if url[-1] == '/':
@@ -349,9 +356,10 @@ def getTinyfiedUrl(request, area_name='', parameters=''):
text = unicode(Marker.objects.get(id=item.split('=')[1]))
except (IndexError, Marker.DoesNotExist):
pass
- data = '{"urn": "%s", "url":"%s", "text":"%s"}' % (urlquote(urn),
- urlquote(url), urlquote(text))
- return HttpResponse(data)
+ data["urn"] = urlquote(urn)
+ data["url"] = urlquote(url)
+ data["text"] = urlquote(text)
+ return data
def redirectFromTinyURN(request, area_name='', tiny_urn=''):
"""