diff --git a/ClusterController/QstatParser.py b/ClusterController/QstatParser.py index e87a633..28eb448 100644 --- a/ClusterController/QstatParser.py +++ b/ClusterController/QstatParser.py @@ -113,7 +113,7 @@ class QstatParser: # ntckts The job's ticket amount in normalized fashion. # ppri The job's -p priority as specified by the user. - jobRegularExp = re.compile( '^[ ]*(?P[^ ]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9]+)[ ]+(?P[^ ]+)[ ]+(?P[^ ]+)[ ]+(?P[^ ]+)[ ]+(?P[0-9][0-9]/[0-9][0-9]/[0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])[ ]+(?P[0-9]+)[ ]+(?P[^\n]*)[\s]*$' ) + jobRegularExp = re.compile( '^[ ]*(?P[^ ]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P[0-9.]+)[ ]+(?P-?[0-9]+)[ ]+(?P[^ ]+)[ ]+(?P[^ ]+)[ ]+(?P[^ ]+)[ ]+(?P[0-9][0-9]/[0-9][0-9]/[0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])[ ]+(?P[0-9]+)[ ]+(?P[^\n]*)[\s]*$' ) # example of machine line : # allintel.q@simpatix34.univ-ren BIP 0/6/8 6.00 darwin-x86 machineRegularExp = re.compile( '^(?P[^@]+)@(?P[^ ]+)[ ]+(?P[^ ]+)[ ]+(?P[^/]+)/(?P[^/]+)/(?P[^ ]+)[ ]+(?P[^ ]+)[\s]+(?P[^ ]+)[\s]+(?P[^\s]*)' )