Fixed bug for sfi.py show slice record.

[sfa.git] / sfa / senslab / slabdriver.py

diff --git a/sfa/senslab/slabdriver.py b/sfa/senslab/slabdriver.py
index b905738..95fa8d7 100644 (file)
--- a/sfa/senslab/slabdriver.py
+++ b/sfa/senslab/slabdriver.py
@@ -1262,15 +1262,19 @@ class SlabDriver(Driver):
                     record.update({'PI':[recuser.hrn],
                                 'researcher': [recuser.hrn],
                                 'name':record['hrn'], 
-                                'oar_job_id':[rec['oar_job_id'] for rec in recslice_list],
+                                'oar_job_id':[],
                                 'node_ids': [],
                                 'person_ids':[recslice_list[0]['record_id_user']],
                                 'geni_urn':'',  #For client_helper.py compatibility
                                 'keys':'',  #For client_helper.py compatibility
                                 'key_ids':''})  #For client_helper.py compatibility
+                    
+                    try:
+                        for rec in recslice_list:
+                            record['oar_job_id'].append(rec['oar_job_id'])
+                    except KeyError:
+                        pass
 
-                    #for rec in recslice_list:
-                        #record['oar_job_id'].append(rec['oar_job_id'])
                     logger.debug( "SLABDRIVER.PY \t fill_record_info SLICE \
                                                     recslice_list  %s \r\n \t RECORD %s \r\n \r\n" %(recslice_list,record)) 
                 if str(record['type']) == 'user':
@@ -1296,12 +1300,17 @@ class SlabDriver(Driver):
                         'researcher': [recuser.hrn],
                         'name':record['hrn'], 
                         'node_ids': [],
-                        'oar_job_id': [rec['oar_job_id'] for rec in recslice_list],
-                        'person_ids':[recslice_list[0]['record_id_user']]})
+                        'oar_job_id': [],
+                        'person_ids':[recslice_list[0]['record_id_user']]}) 
+                    try:
+                        for rec in recslice_list:
+                            recslice['oar_job_id'].append(rec['oar_job_id'])
+                    except KeyError:
+                        pass
+                            
                     recslice.update({'type':'slice', \
                                                 'hrn':recslice_list[0]['slice_hrn']})
-                    #for rec in recslice_list:
-                        #recslice['oar_job_id'].append(rec['oar_job_id'])
+
 
                     #GetPersons takes [] as filters 
                     #user_slab = self.GetPersons([{'hrn':recuser.hrn}])