Un-commented-out important alert code. Typo in RSS index.

Fixed a minor type for the MBTA RSS link.
createPayload function was accidentally commented out,
which caused MBTA event creation to fail.  Yow.

gracedb/alert.py

@@ -71,22 +71,22 @@ def issueXMPPAlert(event, location):
 #    s.connect()
 #    s.send_myevent(voevent, node)
 #    s.loop(1)
-#
-#def createPayload (uid, filename):
-#    template = """<?xml version='1.0' encoding='utf-8'?>
-#<!DOCTYPE LIGO_LW SYSTEM "http://ldas-sw.ligo.caltech.edu/doc/ligolwAPI/html/ligolw_dtd.txt">
-#<LIGO_LW>
-#        <Table Name="LVAlert:table">
-#                <Column Type="lstring" Name="LVAlert:uid"/>
-#                <Column Type="lstring" Name="LVAlert:file"/>
-#                <Stream Name="LVAlert:table" Type="Local" Delimiter=",">
-#                        "%(uid)s","%(filename)s"
-#                </Stream>
-#        </Table>
-#</LIGO_LW>
-#"""
-#    return template % { 'uid': uid, 'filename': filename }
-#
+
+def createPayload (uid, filename):
+    template = """<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE LIGO_LW SYSTEM "http://ldas-sw.ligo.caltech.edu/doc/ligolwAPI/html/ligolw_dtd.txt">
+<LIGO_LW>
+        <Table Name="LVAlert:table">
+                <Column Type="lstring" Name="LVAlert:uid"/>
+                <Column Type="lstring" Name="LVAlert:file"/>
+                <Stream Name="LVAlert:table" Type="Local" Delimiter=",">
+                        "%(uid)s","%(filename)s"
+                </Stream>
+        </Table>
+</LIGO_LW>
+"""
+    return template % { 'uid': uid, 'filename': filename }
+
 ## pubsub import must come first because it overloads part of the
 ## StanzaProcessor class
 #from glue.lvalert import pubsub

templates/feeds/index.html

@@ -12,6 +12,7 @@
     <li><a href="/gracedb/feeds/latest/burst/">Burst</a></li>
       <ul>
         <li><a href="/gracedb/feeds/latest/burst/omega">Omega</a></li>
+        <li><a href="/gracedb/feeds/latest/stochastic/cwb">CWB</a></li>
         <li><a href="/gracedb/feeds/latest/burst/q">Q</a></li>
         <li><a href="/gracedb/feeds/latest/burst/x">X</a></li>
       </ul>
@@ -24,15 +25,12 @@
         <li><a href="/gracedb/feeds/latest/cbc/highmass">High Mass</a></li>
         <li><a href="/gracedb/feeds/latest/cbc/grb">GRB</a></li>
         <li><a href="/gracedb/feeds/latest/cbc/ringdown">Ringdown</a></li>
-        <li><a href="/gracedb/feeds/latest/cbs/mbtaonline">MBTA Online</a></li>
+        <li><a href="/gracedb/feeds/latest/cbc/mbtaonline">MBTA Online</a></li>
       </ul>
   </ul>
 
   <ul>
     <li><a href="/gracedb/feeds/latest/stochastic/">Stochastic</a></li>
-      <ul>
-        <li><a href="/gracedb/feeds/latest/stochastic/cwb">CWB</a></li>
-      </ul>
   </ul>
 </p>