Mercurial > hg > nsaunier > traffic-intelligence
diff python/metadata.py @ 1015:cf9d29de3dbf
merge With Pr Saunier's code
| author | Wendlasida |
|---|---|
| date | Mon, 04 Jun 2018 11:25:49 -0400 |
| parents | 75601be6019f |
| children |
line wrap: on
line diff
--- a/python/metadata.py Fri Jun 01 17:32:52 2018 -0400 +++ b/python/metadata.py Mon Jun 04 11:25:49 2018 -0400 @@ -350,12 +350,17 @@ Session = sessionmaker(bind=engine) return Session() -def getSite(session, siteId): +def getSite(session, siteId = None, name = None, description = None): 'Returns the site(s) matching the index or the name' - if str.isdigit(siteId): + if siteId is not None: return session.query(Site).filter(Site.idx == int(siteId)).all() + elif name is not None: + return session.query(Site).filter(Site.description.like('%'+name+'%')).all() + elif description is not None: + return session.query(Site).filter(Site.description.like('%'+description+'%')).all() else: - return session.query(Site).filter(Site.description.like('%'+siteId+'%')).all() + print('No siteId, name or description have been provided to the function') + return [] def getCameraView(session, viewId): 'Returns the site(s) matching the index' @@ -405,3 +410,6 @@ startTime += duration session.add_all(videoSequences) session.commit() + +# management +# TODO need to be able to copy everything from a site from one sqlite to another, and delete everything attached to a site
