X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fsfa-start.py;h=1f2221558df8347d134815fafa30fee0d552dd7b;hb=108f6d000af6517d3b22501255b377a83568b946;hp=9a5d756e3962a459e8b7242c1ef4af18dc901c59;hpb=7e85c7c9539ba8e8c21940ab6d620961c4eec009;p=sfa.git diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py index 9a5d756e..1f222155 100755 --- a/sfa/server/sfa-start.py +++ b/sfa/server/sfa-start.py @@ -129,7 +129,7 @@ def update_cert_records(gids): Make sure there is a record in the registry for the specified gids. Removes old records from the db. """ - # import SfaTable here so this module can be loaded by PlcComponentApi + # import db stuff here here so this module can be loaded by PlcComponentApi from sfa.storage.alchemy import dbsession from sfa.storage.persistentobjs import RegRecord if not gids: @@ -138,7 +138,7 @@ def update_cert_records(gids): gid_urns = [gid.get_urn() for gid in gids] hrns_expected = [gid.get_hrn() for gid in gids] records_found = dbsession.query(RegRecord).\ - filter_by(pointer=-1)filter(RegRecord.hrn.in_(hrns_expected)).all() + filter_by(pointer=-1).filter(RegRecord.hrn.in_(hrns_expected)).all() # remove old records for record in records_found: @@ -151,12 +151,11 @@ def update_cert_records(gids): hrn, type = gid.get_hrn(), gid.get_type() record = dbsession.query(RegRecord).filter_by(hrn=hrn, type=type,pointer=-1).first() if not record: - record = RegRecord (type=type) - record.set_from_dict ( - { 'hrn': hrn, - 'authority': get_authority(hrn), - 'gid': gid.save_to_string(save_parents=True), - }) + record = RegRecord (dict= {'type':type, + 'hrn': hrn, + 'authority': get_authority(hrn), + 'gid': gid.save_to_string(save_parents=True), + }) dbsession.add(record) dbsession.commit()