diff --git a/gracedb/events/urls.py b/gracedb/events/urls.py index 5642c2e51d5dc70f09731e48c4160a782dc3e640..6a71152a45af1ea3566c292fd7a9e31b7b484927 100644 --- a/gracedb/events/urls.py +++ b/gracedb/events/urls.py @@ -15,9 +15,6 @@ urlpatterns = [ # Event detail page url(r'^(?P<graceid>[GEHMT]\d+)/view/$', views.view, name="view"), - # Event VOEvent creation page - url(r'^(?P<graceid>[GEHMT]\d+)/voevent/$', views.voevent, name="voevent"), - # Event file list and file download url(r'^(?P<graceid>[GEHMT]\d+)/files/$', views.file_list, name="file_list"), @@ -56,10 +53,6 @@ urlpatterns = [ url(r'^view/(?P<graceid>[GEHMT]\d+)', views.view, name="legacyview"), url(r'^(?P<graceid>[GEHMT]\d+)$', views.view, name="legacyview2"), - # VOEvent creation - url(r'^voevent/(?P<graceid>[GEHMT]\d+)', views.voevent, - name="legacyvoevent"), - # Neighbors url((r'^neighbors/(?P<graceid>[GEHMT]\d+)/\(?(?P<delta1>[-+]?\d+)' '(,(?P<delta2>[-+]?\d+)\)?)?'), views.neighbors, diff --git a/gracedb/events/views.py b/gracedb/events/views.py index 3c9da215f8dd4e82e84d7ff872a7a370347f7893..ff7d555f596107872fb3ffe3110f4fec4e65b8d0 100644 --- a/gracedb/events/views.py +++ b/gracedb/events/views.py @@ -134,28 +134,6 @@ def index(request): return render(request, 'gracedb/index.html', context=context) -@event_and_auth_required -def voevent(request, event): - # Default VOEvent type is 'preliminary' - voevent_type=request.GET.get('voevent_type', 'preliminary') - internal=request.GET.get('internal', 1) - try: - # Tanner (10/25/2016): need to modify this call to buildVOEvent, - # second argument should be a serial_number. - voevent = buildVOEvent(event, voevent_type=voevent_type, - request=request, internal=internal) - - # Issue alert - EventVOEventAlertIssuer(voevent, alert_type='voevent').issue_alerts() - # Exceptions caused by user errors of some sort. - except VOEventBuilderException, e: - return HttpResponseBadRequest(str(e)) - # All other exceptions return 500. - except Exception, e: - return HttpResponseServerError(str(e)) - - return HttpResponse(voevent, content_type="application/xml") - def create(request): d = _create(request) if isinstance(d, HttpResponse):