records = dbsession.query(RegRecord).filter_by(authority=hrn).all()
# logger.debug("non recursive mode, found %d local records"%(len(records)))
# so that sfi list can show more than plain names...
- for record in records: augment_with_sfa_builtins (record)
- record_dicts=[ record.todict(exclude_types=[InstrumentedList]) for record in records ]
+ for record in records:
+ # xxx mystery - again this useless statement is key here so that
+ # resulting records have their __dict__ field actually in line with the
+ # object's contents; was first observed with authorities' 'name' column
+ # that would be missing from result as received by client
+ # record.todict() is the place where __dict__ is used
+ print "DO NOT REMOVE ME before augment_with_sfa_builtins, record=%s"%record
+ augment_with_sfa_builtins(record)
+ record_dicts = [ record.todict(exclude_types=(InstrumentedList,)) for record in records ]
return record_dicts
record.email = email
# update the PLC information that was specified with the record
- # xxx oddly enough, without this useless statement,
+ # xxx mystery: oddly enough, without this useless statement,
# record.__dict__ as received by the driver seems to be off
# anyway the driver should receive an object
# (and then extract __dict__ itself if needed)
from sfa.util.xml import XML
from sfa.trust.gid import GID
+from sfa.util.sfalogging import logger
+
class Record:
def __init__(self, dict=None, xml=None):
# fallback
return "** undef_datetime **"
- # it may be important to exclude relationships, which fortunately
+ #
+ # need to filter out results, esp. wrt relationships
+ # exclude_types must be a tuple so we can use isinstance
#
def todict (self, exclude_types=None):
- if exclude_types is None: exclude_types=[]
- d=self.__dict__
- def exclude (k,v):
- if k.startswith('_'): return True
- if exclude_types:
- for exclude_type in exclude_types:
- if isinstance (v,exclude_type): return True
- return False
- keys=[k for (k,v) in d.items() if not exclude(k,v)]
- return dict ( [ (k,d[k]) for k in keys ] )
+ if exclude_types is None:
+ exclude_types = ()
+ d = self.__dict__
+ def exclude (k, v):
+ return k.startswith('_') or isinstance (v, exclude_types)
+ keys = [ k for k, v in d.items() if not exclude(k, v) ]
+ return { k : d[k] for k in keys }
def toxml(self):
return self.save_as_xml()