Added != as a filter comparator

1 files changed, 10 insertions, 9 deletions

diff --git a/sta.py b/sta.py
index 4ff6414..6ff6b51 100755
--- a/sta.py
+++ b/sta.py
@@ -44,9 +44,9 @@ class Trace:
     def filter(self, criteria):
         """Apply a filter to the trace"""
 
-        #Determine if they want to filter by >, <, or ==
+        #Determine if they want to filter by >, <, !=, or ==
         comp = None
-        seps = ['>','<','==']
+        seps = ['>','<','==','!=']
         for sep in seps:
             if criteria.find(sep) > 0: 
                 comp = sep
@@ -71,9 +71,15 @@ class Trace:
         """Return the number of records in the trace"""
         return len(list(self.iter))
 
-    def sort(self, func):
+    #Needs to be tested/finished
+    def sort(self, key):
         """Return the records sorted by some key""" 
-        self.iter = sorted(self.iter, key=func)
+        def sortfunc(record):
+            if key in record:
+                return record[key]
+            else:
+                return 0
+        self.iter = sorted(self.iter, key=sortfunc)
 
 
 ####################################
@@ -88,7 +94,6 @@ class StHeader:
     keys = ['type','cpu','pid','job']
     message = 'The header.'
 
-
 class StNameData:
     format =  '16s'
     formatStr = struct.Struct(StHeader.format + format)
@@ -121,7 +126,6 @@ class StSwitchToData:
     keys = StHeader.keys + ['when','exec_time']
     message = 'A process was switched to on a given CPU.'
 
-
 class StSwitchAwayData:
     format =  'LI'
     formatStr = struct.Struct(StHeader.format + format)
@@ -134,21 +138,18 @@ class StCompletionData:
     keys = StHeader.keys + ['when','forced?','flags']
     message = 'A job completed.'
 
-
 class StBlockData:
     format =  'L'
     formatStr = struct.Struct(StHeader.format + format)
     keys = StHeader.keys + ['when']
     message = 'A task blocks.'
 
-
 class StResumeData:
     format =  'L'
     formatStr = struct.Struct(StHeader.format + format)
     keys = StHeader.keys + ['when']
     message = 'A task resumes.'
 
-
 class StSysReleaseData:
     format =  'LL'
     formatStr = struct.Struct(StHeader.format + format)