diff --git a/gracedb/models.py b/gracedb/models.py index 64db85b579c3783e400c05a5eacd62f38464ed45..429321c7028214500615c9b64057069b7069eb09 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 464b556ecf932aa79e6714cd37a79df3dfdcf9d3..41bfc268020c484bb4f11c612fc4ff2ec27c7eaa 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]