X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FSessions.py;h=3e4355daa6975dd9ce2f19e57d7d60891e2a5426;hb=f7ce7ce813d4c44502629820a3583f32a99a98f7;hp=33fd3b1ce607e32e257335952288fc5abccbba96;hpb=9a608e111c7f8182f51753ea3f563ebc19eb4c71;p=plcapi.git diff --git a/PLC/Sessions.py b/PLC/Sessions.py index 33fd3b1..3e4355d 100644 --- a/PLC/Sessions.py +++ b/PLC/Sessions.py @@ -67,21 +67,21 @@ class Sessions(Table): """ def __init__(self, api, session_filter = None, expires = int(time.time())): - Table.__init__(self, api, Session) + Table.__init__(self, api, Session) sql = "SELECT %s FROM view_sessions WHERE True" % \ ", ".join(Session.fields) - if session_filter is not None: - if isinstance(session_filter, (list, tuple, set)): - # Separate the list into integers and strings + if session_filter is not None: + if isinstance(session_filter, (list, tuple, set)): + # Separate the list into integers and strings ints = filter(lambda x: isinstance(x, (int, long)), session_filter) strs = filter(lambda x: isinstance(x, StringTypes), session_filter) session_filter = Filter(Session.fields, {'person_id': ints, 'session_id': strs}) sql += " AND (%s) %s" % session_filter.sql(api, "OR") - elif isinstance(session_filter, dict): - session_filter = Filter(Session.fields, session_filter) - sql += " AND (%s) %s" % session_filter.sql(api, "AND") + elif isinstance(session_filter, dict): + session_filter = Filter(Session.fields, session_filter) + sql += " AND (%s) %s" % session_filter.sql(api, "AND") if expires is not None: if expires >= 0: