add GetSliceTicket

[plcapi.git] / PLC / Events.py

diff --git a/PLC/Events.py b/PLC/Events.py
index b8131c8..e87cbbe 100644 (file)
--- a/PLC/Events.py
+++ b/PLC/Events.py
@@ -4,7 +4,7 @@
 # Tony Mack <tmack@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: Events.py,v 1.6 2006/11/09 03:07:42 mlhuang Exp $
+# $Id: Events.py,v 1.10 2006/12/20 14:07:22 tmack Exp $
 #
 
 from PLC.Faults import *
@@ -24,10 +24,11 @@ class Event(Row):
         'event_id': Parameter(int, "Event identifier"),
         'person_id': Parameter(int, "Identifier of person responsible for event, if any"),
         'node_id': Parameter(int, "Identifier of node responsible for event, if any"),
-        'event_type': Parameter(str, "Type of event"),
-        'object_type': Parameter(str, "Type of object affected by this event"),
         'fault_code': Parameter(int, "Event fault code"),
-        'call': Parameter(str, "Call responsible for this event"),
+       'call_name': Parameter(str, "Call responsible for this event"),
+       'call': Parameter(str, "Call responsible for this event, including paramters"),
+       'message': Parameter(str, "High level description of this event"),
+       'object_type': Parameter(str, "What type of object is this event affecting"),
         'runtime': Parameter(float, "Runtime of event"),
         'time': Parameter(int, "Date and time that the event took place, in seconds since UNIX epoch", ro = True),
         'object_ids': Parameter([int], "IDs of objects affected by this event")
@@ -72,5 +73,5 @@ class Events(Table):
             elif isinstance(event_filter, dict):
                 event_filter = Filter(Event.fields, event_filter)
             sql += " AND (%s)" % event_filter.sql(api)
-
+       sql += " ORDER BY %s" % Event.primary_key
         self.selectall(sql)