X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FEvents.py;h=e87cbbe49d826b07fc2ca053b4a7c92a326c7dff;hb=c93e31479f4b3da49a06345e65179a9d16165c9b;hp=774aae930168ef6f74fcc72985cfa099bd45a9e9;hpb=22aa65daea960e86e0e791684db1cfc6dfd0fabd;p=plcapi.git

diff --git a/PLC/Events.py b/PLC/Events.py
index 774aae9..e87cbbe 100644
--- 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.7 2006/11/09 19:43:55 mlhuang Exp $
+# $Id: Events.py,v 1.10 2006/12/20 14:07:22 tmack Exp $
 #
 
 from PLC.Faults import *
@@ -27,6 +27,8 @@ class Event(Row):
         'fault_code': Parameter(int, "Event fault code"),
 	'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")
@@ -71,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)