From 93f06778df64896cc667c1b9d02306c95b8b8cee Mon Sep 17 00:00:00 2001
From: Branson Stephens <branson.stephens@ligo.org>
Date: Tue, 12 May 2015 08:56:50 -0500
Subject: [PATCH] Changed gstlalcbc_report to cbcreport.
---
gracedb/reports.py | 18 +++++++++---------
.../{gstlalcbc_report.html => cbc_report.html} | 4 ++--
templates/gracedb/histogram.html | 2 +-
urls.py | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
rename templates/gracedb/{gstlalcbc_report.html => cbc_report.html} (96%)
diff --git a/gracedb/reports.py b/gracedb/reports.py
index 7949c33ce..ec217c023 100644
--- a/gracedb/reports.py
+++ b/gracedb/reports.py
@@ -122,7 +122,7 @@ def rate_data():
# XXX This should be configurable / moddable or something
MAX_QUERY_RESULTS = 1000
-# The following two util routines are for gstlalcbc_report. This is messy.
+# The following two util routines are for cbc_report. This is messy.
def cluster(events):
# FIXME N^2 clustering, but event list should always be small anyway...
def quieter(e1, events = events, win = 5):
@@ -143,7 +143,7 @@ def to_png_image(out = sys.stdout):
return base64.b64encode(f.getvalue())
@internal_user_required
-def gstlalcbc_report(request, format=""):
+def cbc_report(request, format=""):
if not request.user or not request.user.is_authenticated():
return HttpResponseForbidden("Forbidden")
@@ -179,7 +179,7 @@ def gstlalcbc_report(request, format=""):
errormsg = 'Your query returned items that are not CoincInspiral Events. '
errormsg += 'Please try again.'
form = SimpleSearchForm()
- return render_to_response('gracedb/gstlalcbc_report.html',
+ return render_to_response('gracedb/cbc_report.html',
{ 'form':form, 'message':errormsg},
context_instance=RequestContext(request))
@@ -197,7 +197,7 @@ def gstlalcbc_report(request, format=""):
# Bounce back to the user with an error message
errormsg = 'Your query does not have a gpstime range. Please try again.'
form = SimpleSearchForm()
- return render_to_response('gracedb/gstlalcbc_report.html',
+ return render_to_response('gracedb/cbc_report.html',
{ 'form':form, 'message':errormsg},
context_instance=RequestContext(request))
lt = int(gpsrange[1]) - int(gpsrange[0])
@@ -206,14 +206,14 @@ def gstlalcbc_report(request, format=""):
# XXX Hardcoded limit
if objects.count() > 2000:
errormsg = 'Your query returned too many events. Please try again.'
- return render_to_response('gracedb/gstlalcbc_report.html',
+ return render_to_response('gracedb/cbc_report.html',
{ 'form':form, 'message':errormsg},
context_instance=RequestContext(request))
# Zero events will break the min/max over masses below.
if objects.count() < 1:
errormsg = 'Your query returned no events. Please try again.'
- return render_to_response('gracedb/gstlalcbc_report.html',
+ return render_to_response('gracedb/cbc_report.html',
{ 'form':form, 'message':errormsg},
context_instance=RequestContext(request))
@@ -299,7 +299,7 @@ def gstlalcbc_report(request, format=""):
context = {
'title': title,
'form': form,
- 'formAction': reverse(gstlalcbc_report),
+ 'formAction': reverse(cbc_report),
'count' : objects.count(),
'rawquery' : rawquery,
'FAR_color_map' : FAR_color_map,
@@ -308,10 +308,10 @@ def gstlalcbc_report(request, format=""):
'ifar_plot' : ifar_plot,
'clustered_events' : clustered_events,
}
- return render_to_response('gracedb/gstlalcbc_report.html', context,
+ return render_to_response('gracedb/cbc_report.html', context,
context_instance=RequestContext(request))
- return render_to_response('gracedb/gstlalcbc_report.html',
+ return render_to_response('gracedb/cbc_report.html',
{ 'form' : form,
},
context_instance=RequestContext(request))
diff --git a/templates/gracedb/gstlalcbc_report.html b/templates/gracedb/cbc_report.html
similarity index 96%
rename from templates/gracedb/gstlalcbc_report.html
rename to templates/gracedb/cbc_report.html
index 3429de9ce..f63d526c0 100644
--- a/templates/gracedb/gstlalcbc_report.html
+++ b/templates/gracedb/cbc_report.html
@@ -6,9 +6,9 @@
onload="document.search_form.query.focus();"
{% endblock %}
-{% block title %}gstlalcbc Report{% endblock %}
+{% block title %}CBC Report{% endblock %}
{% block heading %}{% endblock %} #}
-{% block pageid %}gstlalcbc Report{% endblock %}
+{% block pageid %}CBC Report{% endblock %}
{% block jscript %}
<script type="text/javascript">
diff --git a/templates/gracedb/histogram.html b/templates/gracedb/histogram.html
index 6457ffc49..0c2d07144 100644
--- a/templates/gracedb/histogram.html
+++ b/templates/gracedb/histogram.html
@@ -82,7 +82,7 @@ function toggle(id) {
{% block content %}
<br/>
-<a href="{% url "gstlalcbc_report" %}"><h3>Dynamic CBC Report</h3></a>
+<a href="{% url "cbc_report" %}"><h3>Dynamic CBC Report</h3></a>
<br/>
<br/>
diff --git a/urls.py b/urls.py
index e20f56265..608640d42 100644
--- a/urls.py
+++ b/urls.py
@@ -37,7 +37,7 @@ urlpatterns = patterns('',
url (r'^performance/$', 'gracedb.views.performance', name="performance"),
url (r'^reports/$', 'gracedb.reports.histo', name="reports"),
- url (r'^reports/gstlalcbc_report/(?P<format>(json|flex))?$', 'gracedb.reports.gstlalcbc_report', name="gstlalcbc_report"),
+ url (r'^reports/cbc_report/(?P<format>(json|flex))?$', 'gracedb.reports.cbc_report', name="cbc_report"),
#(r'^reports/(?P<path>.+)$', 'django.views.static.serve',
# {'document_root': settings.LATENCY_REPORT_DEST_DIR}),
--
GitLab