Mercurial Hosting > traffic-intelligence
comparison python/metadata.py @ 862:2d6249fe905a
correcting bug
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 07 Nov 2016 11:11:10 -0500 |
parents | f9c9457b60c2 |
children | 5afa1d30edd8 |
comparison
equal
deleted
inserted
replaced
861:f9c9457b60c2 | 862:2d6249fe905a |
---|---|
131 else: | 131 else: |
132 self.map1 = None | 132 self.map1 = None |
133 self.map2 = None | 133 self.map2 = None |
134 | 134 |
135 @staticmethod | 135 @staticmethod |
136 def getCameraType(session, cameraTypeId): | 136 def getCameraType(session, cameraTypeId, resX = None): |
137 'Returns the site(s) matching the index or the name' | 137 'Returns the site(s) matching the index or the name' |
138 if str.isdigit(cameraTypeId): | 138 if str.isdigit(cameraTypeId): |
139 return session.query(CameraType).filter(CameraType.idx == int(cameraTypeId)).all() | 139 return session.query(CameraType).filter(CameraType.idx == int(cameraTypeId)).all() |
140 else: | 140 else: |
141 return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all() | 141 if resX is not None: |
142 return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).filter(CameraType.resX == resX).all() | |
143 else: | |
144 return session.query(CameraType).filter(CameraType.name.like('%'+cameraTypeId+'%')).all() | |
142 | 145 |
143 class CameraView(Base): | 146 class CameraView(Base): |
144 __tablename__ = 'camera_views' | 147 __tablename__ = 'camera_views' |
145 idx = Column(Integer, primary_key=True) | 148 idx = Column(Integer, primary_key=True) |
146 description = Column(String) | 149 description = Column(String) |