diff -r 0bb9c29cd41d -r eb479baeb2bf src/hdalab/views/ajax.py --- a/src/hdalab/views/ajax.py Thu Jul 03 12:47:04 2014 +0200 +++ b/src/hdalab/views/ajax.py Tue Jul 08 12:03:06 2014 +0200 @@ -261,6 +261,14 @@ max_tag_order = int(request.GET.get('mto', '12')) content_count = request.GET.get('contentcount', 12) tag_count = request.GET.get('tagcount', 30) + + outputstr = filter_generic(lang, periode, label, country, contentlist, max_tag_order, content_count, tag_count) + + return HttpResponse(content=outputstr, mimetype='application/json') + + +def filter_generic(lang="fr-fr", periode=None, label=None, country=None, contentlist=None, max_tag_order=12, content_count=12, tag_count=30): + no_translate_langs = [ 'fr' ] key_parts = ("filter",lang,periode,label,country,contentlist,max_tag_order,content_count,tag_count) @@ -428,8 +436,10 @@ output = {'count': cont_count, 'contents': contenus, 'tags':tags, 'sparkline':yearchange, 'countries':countries, 'disciplines':disciplines, 'tagtranslations': tag_translations} outputstr = json.dumps(output) cache.set(cache_key, outputstr) - - return HttpResponse(content=outputstr, mimetype='application/json') + + return outputstr + + def subtree(tree): MAX_TAG_ORDER = 16