diff --git a/gracedb/reports.py b/gracedb/reports.py index 7949c33ceaa49a4adefc2242e037f0c750aa8737..ec217c02375a0a595b5977f6b1628a46e71c6937 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 3429de9ce0b3b20dc8403647e7ee5ce687b0d3b8..f63d526c06d5eaeaae88e427d3286748b4ba24b6 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 6457ffc494957719403e63de6e2d525f31fbb16d..0c2d07144b634293d83aa8c6dc5f27149bd89d7e 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 e20f562651a6d8ad3af97282abb9b080f6ac62cd..608640d421659829d6f2aafa03eb6c809dfd0c39 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}),