From 6bf542676174ee063bc3f5ca5c5a29cea5c2974f Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Tue, 4 Dec 2012 15:38:16 -0600
Subject: [PATCH] Removed references to Wiki page.
---
gracedb/alert.py | 2 -
gracedb/models.py | 3 --
gracedb/views.py | 59 +------------------------
templates/feeds/latest_description.html | 1 -
templates/gracedb/event_detail.html | 6 +--
templates/gracedb/event_list.html | 3 +-
6 files changed, 4 insertions(+), 70 deletions(-)
diff --git a/gracedb/alert.py b/gracedb/alert.py
index 3eb79d277..8b2cfb6b8 100644
--- a/gracedb/alert.py
+++ b/gracedb/alert.py
@@ -94,7 +94,6 @@ New Event
GRACEID: %s
Info: %s
Data: %s
-TWiki: %s
Submitter: %s
Event Summary:
%s
@@ -104,7 +103,6 @@ Event Summary:
event.graceid(),
'https://'+Site.objects.get_current().domain+ reverse("view", args=[event.graceid()]),
event.weburl(),
- event.wikiurl(),
event.submitter.name,
indent(3, prepareSummary(event))
)
diff --git a/gracedb/models.py b/gracedb/models.py
index 9b0842f92..bf1f1eb7d 100644
--- a/gracedb/models.py
+++ b/gracedb/models.py
@@ -96,9 +96,6 @@ class Event(models.Model):
def weburl(self):
return "https://ldas-jobs.phys.uwm.edu/gracedb/data/%s" % self.graceid()
- def wikiurl(self):
- return "https://www.lsc-group.phys.uwm.edu/twiki/bin/view/Sandbox/%s" % self.graceid()
-
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 6f76d68c7..150d63ec2 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -228,7 +228,6 @@ def _createEventFromForm(request, form):
fdest.write(chunk)
fdest.close()
# Create WIKI page
- createWikiPage(event.graceid())
# Extract Info from uploaded data
# Temp (ha!) hack to deal with
@@ -891,8 +890,7 @@ def flexigridResponse(request, objects):
scientific(object.far),
- '<a href="%s">Data</a> <a href="%s">Wiki</a>' %
- (object.weburl(), object.wikiurl()),
+ '<a href="%s">Data</a>' % object.weburl(),
#created_times['gps'],
created_times.get('utc',""),
@@ -932,61 +930,6 @@ def get_file(graceid, filename="event.log"):
contents = None
return contents
-def createWikiPage(graceid):
- # Do not create wiki pages these reasons
- # (1) freaks out the wiki/filesystem to have too many files in one directory.
- # (2) do not need them if they are empty. They'll be auto-created if ppl go to them and want them.
- # (3) htdocs (where the wikipage goes) is mounted read-only.
- return
- twikiroot = "/mnt/htdocs/uwmlsc/secure/twiki/data/Sandbox/"
- plainFile = """
-Initial Entry for %s
-
-%%TOC{depth="2"}%%
-""" % graceid
- rcsFile = """head 1.1;
-access;
-symbols;
-locks
- apache:1.1; strict;
-comment @# @;
-
-
-1.1
-date 2009.06.13.00.09.15; author apache; state Exp;
-branches;
-next ;
-
-
-desc
-@Initial Revision
-@
-
-
-1.1
-log
-@Initial revision
-@
-text
-@
-Initial Entry for %s
-
-%%TOC{depth="2"}%%
-@
-""" % graceid
- pname = os.path.join(twikiroot, graceid+".txt")
- rcsname = os.path.join(twikiroot, graceid+".txt,r")
- f = open(pname, "w")
- f.write(plainFile)
- f.close()
-
- f = open(rcsname, "w")
- f.write(rcsFile)
- f.close()
-
- os.chmod(pname, 0644)
- os.chmod(rcsname, 0444)
-
class LimitedEvent():
def __init__(self, event):
diff --git a/templates/feeds/latest_description.html b/templates/feeds/latest_description.html
index 919b670b2..645cc32ff 100644
--- a/templates/feeds/latest_description.html
+++ b/templates/feeds/latest_description.html
@@ -16,6 +16,5 @@
</table>
<ul>
<li><a href="{{ obj.weburl }}">Data</a></li>
- <li><a href="{{ obj.wikiurl }}">TWiki</a></li>
</ul>
Sumbmitter: {{ obj.submitter.name }}<br/>
diff --git a/templates/gracedb/event_detail.html b/templates/gracedb/event_detail.html
index 510cedc7f..b97ae597c 100644
--- a/templates/gracedb/event_detail.html
+++ b/templates/gracedb/event_detail.html
@@ -177,7 +177,7 @@
Event Time
</th>
<th>FAR (Hz)</th>
- <th colspan="2">Links</th>
+ <th>Links</th>
<th>
{{"created"|timeselect:"utc" }}
Submitted
@@ -201,7 +201,6 @@
{% endif %}</td>
<td>{{ object.far|scientific }}</td>
<td><a href="{{ object.weburl }}">Data</a></td>
- <td><a href="{{ object.wikiurl }}">Wiki</a></td>
<td>{{ object.created|multiTime:"created" }}</td>
</tr>
@@ -222,7 +221,7 @@
Event Time
</th>
<th>FAR (Hz)</th>
- <th colspan="2">Links</th>
+ <th>Links</th>
<th>
{{"ncreated"|timeselect:"utc" }}
Submitted
@@ -244,7 +243,6 @@
{% endif %}</td>
<td>{{ object.far|scientific }}</td>
<td><a href="{{ object.weburl }}">Data</a></td>
- <td><a href="{{ object.wikiurl }}">Wiki</a></td>
<td>{{ object.created|multiTime:"ncreated" }}</td>
</tr>
{% endfor %}
diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html
index 405ffb9d4..6fd33e950 100644
--- a/templates/gracedb/event_list.html
+++ b/templates/gracedb/event_list.html
@@ -156,8 +156,7 @@
{{ obj.gpstime }}
{% endif %}
</td>
- <td><a href="{{ obj.weburl }}">Data</a>
- <a href="{{ obj.wikiurl }}">Wiki</a></td>
+ <td><a href="{{ obj.weburl }}">Data</a></td>
<td>{{ obj.created }}</td>
</tr>
{% endfor %}
--
GitLab