From 6bf52e68e87339337ac89ac6d1bb531ae240eee1 Mon Sep 17 00:00:00 2001
From: Branson Stephens <branson.stephens@ligo.org>
Date: Tue, 22 Jul 2014 12:10:23 -0500
Subject: [PATCH] Fixed URL sent out in event creation LVAlert to a valid URL,
namely the URL of the event file in the web interface.
---
gracedb/models.py | 1 +
gracedb/views.py | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/gracedb/models.py b/gracedb/models.py
index 64db85b57..429321c70 100644
--- a/gracedb/models.py
+++ b/gracedb/models.py
@@ -116,6 +116,7 @@ class Event(models.Model):
return "https://gracedb.ligo.org/gracedb-files/%s" % self.graceid()
return "https://ldas-jobs.phys.uwm.edu/gracedb/data/%s" % self.graceid()
+ # XXX This should be considered deprecated. (Branson, July 22, 2014.)
def clusterurl(self):
#return "pcdev1.phys.uwm.edu:/archive/gracedb/data/%s" % self.graceid()
return "file://pcdev1.phys.uwm.edu/archive/gracedb/data/%s" % self.graceid()
diff --git a/gracedb/views.py b/gracedb/views.py
index 464b556ec..41bfc2680 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -261,8 +261,12 @@ def _createEventFromForm(request, form):
temp_data_loc = handle_uploaded_data(event, uploadDestination)
try:
# Send an alert.
+ # XXX This reverse will give the web-interface URL, not the REST URL.
+ # This could be a problem if anybody ever tries to use it.
+ # NOTE: The clusterurl method should be considered deprecated.
issueAlert(event,
- os.path.join(event.clusterurl(), "private", f.name),
+ #os.path.join(event.clusterurl(), "private", f.name),
+ request.build_absolute_uri(reverse("file", args=[event.graceid(),f.name])),
temp_data_loc)
except Exception, e:
warnings += ["Problem issuing an alert (%s)" % e]
--
GitLab