# upon entering the write methods (so again register and update) for legacy, as some driver code
# might depend on the presence of, say, 'researcher'
-# registry calls this 'reg-researchers'
-# some drivers call this 'researcher'
-# this is even more confusing as people might use 'researchers'
-def normalize_input_researcher (record):
- # this aims at detecting a mispelled input
- if 'researchers' in record and 'researcher' not in record:
- record['researcher']=record['researchers']
- del record['researchers']
+# normalize an input record to a write method - register or update
+# e.g. registry calls this 'reg-researchers'
+# while some drivers call this 'researcher'
+# we need to make sure that both keys appear and are the same
+def _normalize_input (record, reg_key, driver_key):
# this looks right, use this for both keys
- if 'reg-researchers' in record:
- # and issue a warning if they were both set as we're overwriting some user data here
- if 'researcher' in record:
+ if reg_key in record:
+ # and issue a warning if they were both set and different
+ # as we're overwriting some user data here
+ if driver_key in record:
logger.warning ("normalize_input_researcher: incoming record has both values, using reg-researchers")
- record['researcher']=record['reg-researchers']
+ record[driver_key]=record[reg_key]
# we only have one key set, duplicate for the other one
- elif 'researcher' in record:
- logger.warning ("normalize_input_researcher: you should use 'reg-researchers' instead ot 'researcher'")
- record['reg-researchers']=record['researcher']
- # if at this point we still have 'researchers' it's going to be ignored and that might be confusing
- if 'researchers' in record:
- logger.warning ("normalize_input_researcher: incoming record has confusing 'researchers' key - ignored - use 'reg-researchers' instead")
+ elif driver_key in record:
+ logger.warning ("normalize_input_researcher: you should use '%s' instead ot '%s'"%(reg_key,driver_key))
+ record[reg_key]=record[driver_key]
def normalize_input_record (record):
- normalize_input_researcher (record)
+ _normalize_input (record, 'reg-researchers','researcher')
+ _normalize_input (record, 'reg-pis','pi')
return record
class RegistryManager:
if hrn != api.hrn])
xrn=Xrn(api.hrn,type='authority')
return version_core({'interface':'registry',
- 'sfa': 2,
- 'geni_api': 2,
+ 'sfa': 3,
'hrn':xrn.get_hrn(),
'urn':xrn.get_urn(),
'peers':peers})
return records
- def List (self, api, xrn, origin_hrn=None, options={}):
+ def List (self, api, xrn, origin_hrn=None, options=None):
+ if options is None: options={}
dbsession=api.dbsession()
# load all know registry names into a prefix tree and attempt to find
# the longest matching prefix
record.gid=gid.save_to_string(save_parents=True)
# locate objects for relationships
- pi_hrns = getattr(record,'pi',None)
+ pi_hrns = getattr(record,'reg-pis',None)
if pi_hrns is not None: record.update_pis (pi_hrns, dbsession)
elif isinstance (record, RegSlice):
if researcher_hrns is not None: record.update_researchers (researcher_hrns, dbsession)
elif isinstance (record, RegAuthority):
- pi_hrns = getattr(new_record,'pi',None)
+ pi_hrns = getattr(new_record,'reg-pis',None)
if pi_hrns is not None: record.update_pis (pi_hrns, dbsession)
# update the PLC information that was specified with the record