various tweaks around using records; the client-side is still broken

[sfa.git] / sfa / server / sfa-start.py

diff --git a/sfa/server/sfa-start.py b/sfa/server/sfa-start.py
index 9a5d756..1f22215 100755 (executable)
--- 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()