From 4aef21e6162660fc5e78791626e09bcbc6fa68f0 Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Wed, 6 Jan 2010 12:57:35 -0600
Subject: [PATCH] Added event.log contents to event detail page.
---
gracedb/views.py | 14 ++++++++++++++
templates/gracedb/event_detail.html | 11 +++++++++++
2 files changed, 25 insertions(+)
diff --git a/gracedb/views.py b/gracedb/views.py
index e2e944c85..a1c43d680 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -6,6 +6,7 @@ from django.core.urlresolvers import reverse, get_script_prefix
from django.shortcuts import render_to_response
from django.contrib.sites.models import Site
from django.utils.html import strip_tags, escape
+from django.utils.safestring import mark_safe
from django.views.generic.list_detail import object_detail, object_list
@@ -359,6 +360,7 @@ def view(request, graceid):
except Event.DoesNotExist:
raise Http404
context['object'] = a
+ context['eventdesc'] = get_logfile(graceid)
return render_to_response(
'gracedb/event_detail.html',
context,
@@ -558,6 +560,18 @@ def timeline(request):
# Things that aren't views and should really be elsewhere.
#-----------------------------------------------------------------
+def get_logfile(graceid):
+ dirPrefix = "/mnt/gracedb-web/data"
+ logfilename = os.path.join(dirPrefix, graceid, "private", "event.log")
+ contents = ""
+ try:
+ lines = open(logfilename, "r").readlines()
+ contents = "<br/>".join([ escape(line) for line in lines])
+ contents = mark_safe(contents)
+ except Exception, e:
+ contents = None
+ return contents
+
def createWikiPage(graceid):
twikiroot = "/mnt/htdocs/uwmlsc/secure/twiki/data/Sandbox/"
plainFile = """
diff --git a/templates/gracedb/event_detail.html b/templates/gracedb/event_detail.html
index 7c09be8ac..cb555df02 100644
--- a/templates/gracedb/event_detail.html
+++ b/templates/gracedb/event_detail.html
@@ -7,6 +7,8 @@
{% block content %}
<p>{{ message }}</p>
+<table>
+<tr><td>
<table class="event">
<tr>
@@ -69,4 +71,13 @@
</table>
{% endif %}
+</td>
+<td rowspan="2" valign="top">
+
+{% if eventdesc %}
+<h3>Event Log File</h3>
+ {{ eventdesc }}
+{% endif %}
+
+</td></tr></table>
{% endblock %}
--
GitLab