From 96f47a6fc8f47cda825fa72b7d82936dc36eddc7 Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Wed, 30 May 2012 15:21:50 -0500
Subject: [PATCH] Cleaned up ligolw download function.
---
gracedb/views.py | 4 ++--
templates/gracedb/event_list.html | 1 +
templates/gracedb/query.html | 2 --
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gracedb/views.py b/gracedb/views.py
index 2789ed332..14bf006d3 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -591,11 +591,11 @@ def search(request, format=""):
return flexigridResponse(request, objects)
elif format == "jqgrid":
return jqgridResponse(request, objects)
- elif 'ligolw' in request.POST:
+ elif 'ligolw' in request.POST or 'ligolw' in request.GET:
if objects.count() > 1000:
# XXX Make this -- Better.
- return HttpResponse("No more than 1000 events currently allowed.")
+ return HttpResponse("Sorry -- no more than 1000 events currently allowed.")
from glue.ligolw import ligolw
# lsctables MUST be loaded before utils.
diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html
index da6042033..6d3596397 100644
--- a/templates/gracedb/event_list.html
+++ b/templates/gracedb/event_list.html
@@ -110,6 +110,7 @@
<a onClick="toggle_visibility('hints');">Hints on querying</a>
{% if rawquery %}
| <a href="{% url search %}?query={{rawquery|urlencode}}">Link to current query</a>
+ | <a href="{% url search %}?query={{rawquery|urlencode}}&ligolw">Download LIGOLW File</a>
{% endif %}
</td>
</tr>
diff --git a/templates/gracedb/query.html b/templates/gracedb/query.html
index 7cf2fce80..4b98202df 100644
--- a/templates/gracedb/query.html
+++ b/templates/gracedb/query.html
@@ -31,8 +31,6 @@ onload="document.search_form.query.focus();"
</tr>
<tr><td/><td>{% include "gracedb/query_help_frag.html" %}</td></tr>
</table>
- <input type="Submit" name="submit" value="Submit"/>
- <input type="Submit" name="ligolw" value="LigoLW"/>
</form>
<!-- Old style Query -->
--
GitLab