@@ -462,17 +462,21 @@ def refresh_jobqueue(jobids)
462
462
record [ :queue ] = job [ 90 ..109 ] . strip
463
463
464
464
# Extract the submit time
465
- record [ :submit_time ] = Time . local ( *job [ 110 ..139 ] . strip . split ( /[-:T]/ ) ) . getgm
465
+ if job [ 110 ..139 ] . strip =~ /^\d \d \d \d -\d \d -\d \d T\d \d :\d \d :\d \d $/
466
+ record [ :submit_time ] = Time . local ( *job [ 110 ..139 ] . strip . split ( /[-:T]/ ) ) . getgm
467
+ else
468
+ record [ :submit_time ] = nil
469
+ end
466
470
467
471
# Extract the start time
468
- if job [ 140 ..169 ] . strip != "N/A"
472
+ if job [ 140 ..169 ] . strip =~ /^ \d \d \d \d - \d \d - \d \d T \d \d : \d \d : \d \d $/
469
473
record [ :start_time ] = Time . local ( *job [ 140 ..169 ] . strip . split ( /[-:T]/ ) ) . getgm
470
474
else
471
475
record [ :start_time ] = nil
472
476
end
473
477
474
478
# Extract the end time
475
- if job [ 170 ..199 ] . strip != "N/A"
479
+ if job [ 170 ..199 ] . strip =~ /^ \d \d \d \d - \d \d - \d \d T \d \d : \d \d : \d \d $/
476
480
record [ :end_time ] = Time . local ( *job [ 170 ..199 ] . strip . split ( /[-:T]/ ) ) . getgm
477
481
else
478
482
record [ :end_time ] = nil
@@ -602,17 +606,21 @@ def refresh_jobacct(delta_days)
602
606
record [ :queue ] = jobfields [ 3 ]
603
607
604
608
# Extract the submit time
605
- record [ :submit_time ] = Time . local ( *jobfields [ 5 ] . split ( /[-:T]/ ) ) . getgm
609
+ if jobfields [ 5 ] =~ /^\d \d \d \d -\d \d -\d \d T\d \d :\d \d :\d \d $/
610
+ record [ :submit_time ] = Time . local ( *jobfields [ 5 ] . split ( /[-:T]/ ) ) . getgm
611
+ else
612
+ record [ :submit_time ] = nil
613
+ end
606
614
607
615
# Extract the start time
608
- if jobfields [ 6 ] != "None"
616
+ if jobfields [ 6 ] =~ /^ \d \d \d \d - \d \d - \d \d T \d \d : \d \d : \d \d $/
609
617
record [ :start_time ] = Time . local ( *jobfields [ 6 ] . split ( /[-:T]/ ) ) . getgm
610
618
else
611
619
record [ :start_time ] = nil
612
620
end
613
621
614
622
# Extract the end time
615
- if jobfields [ 7 ] != "None"
623
+ if jobfields [ 7 ] =~ /^ \d \d \d \d - \d \d - \d \d T \d \d : \d \d : \d \d $/
616
624
record [ :end_time ] = Time . local ( *jobfields [ 7 ] . split ( /[-:T]/ ) ) . getgm
617
625
else
618
626
record [ :end_time ] = nil
0 commit comments