Merge branch 'master' of ligo-vcs.phys.uwm.edu:/usr/local/git/gracedb

gracedb/alert.py

@@ -30,9 +30,9 @@ def prepareSummary(event):
     return "GPS Time: %s" % event.gpstime
 
 
-def issueAlertForUpdate(event, description, doxmpp):
+def issueAlertForUpdate(event, description, doxmpp, filename=""):
     if doxmpp:
-        issueXMPPAlert(event, "", "", "update", description)
+        issueXMPPAlert(event, filename, "", "update", description)
     # XXX No emails for this.  Argh.
 
 def issueAlertForLabel(event, label, doxmpp):

gracedb/api.py

@@ -803,7 +803,7 @@ class Files(APIView):
 
         try:
             description = "UPLOAD: {0}".format(filename)
-            issueAlertForUpdate(event, description, doxmpp=True)
+            issueAlertForUpdate(event, description, doxmpp=True, filename=filename)
         except:
             # XXX something should be done here.
             pass

gracedb/query.py

@@ -62,6 +62,7 @@ gpsQ = gpsQ.setParseAction(maybeRange("gpstime"))
 
 # run ids
 runmap = {
+    "ER3" : (1044136816, 1100000000),  # Feb 5 16:00:00 CST 2013 - ??
    #"ER2" : (1026061216, 1028480416),
    #"ER2" : (1026069984, 1028480416),  # soft start
     "ER2" : (1026666016, 1028480416),  # Jul 18 17:00:00 GMT 2012 - Aug 8 17:00:00 GMT 2012

gracedb/views.py

@@ -304,7 +304,7 @@ def _createLog(request, graceid, comment, uploadedFile=None):
             description = "LOG: "
             if uploadedFile:
                 description = "UPLOAD: '%s' " % uploadedFile.name
-            issueAlertForUpdate(event, description+comment, doxmpp=True)
+            issueAlertForUpdate(event, description+comment, doxmpp=True, filename=uploadedFile.name)
 
     # XXX should be json
     rval = str(rdict)

settings/default.py

@@ -166,6 +166,11 @@ AUTHENTICATION_BACKENDS = (
 
 SHIB_AUTHENTICATION_SESSION_INITIATOR = 'https://moe.phys.uwm.edu/Shibboleth.sso/Login'
 
+# If these are left at default, when the Shibboleth middleware
+# creates a new auth_user, they will get admin privs.
+ADMIN_GROUP_HEADER = None
+ADMIN_GROUP = None
+
 MIDDLEWARE_CLASSES = [
     'middleware.accept.AcceptMiddleware',
     'middleware.cli.CliExceptionMiddleware',

utils/__init__.py

@@ -66,5 +66,5 @@ def isoToGps(t):
         fracSec = float('0.' + sec_substr)
     else:
         fracSec = 0
-    posixTime = mktime(ISOTime.utctimetuple()) + fracSec 
+    posixTime = calendar.timegm(ISOTime.utctimetuple()) + fracSec 
     return int(round(posixToGpsTime(posixTime)))