Mercurial > hg > audiodb
changeset 627:a6fc780678a8
Added support for includeKeys/excludeKeys, et al
| author | mas01mj |
|---|---|
| date | Tue, 22 Sep 2009 16:40:57 +0000 |
| parents | eb91549dda8f |
| children | 356d7b319ae8 |
| files | bindings/python/examples/server.py |
| diffstat | 1 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/bindings/python/examples/server.py Tue Sep 22 15:04:58 2009 +0000 +++ b/bindings/python/examples/server.py Tue Sep 22 16:40:57 2009 +0000 @@ -20,8 +20,10 @@ def GET(self): return """ <html> +<head><title>audioDB server</title></head> <body> <ul> +<h2>Path: """+dbPath+"""</h2> <li><a href="/status">Status</a></li> <li><a href="/query">Query</a></li> </ul> @@ -31,6 +33,7 @@ class status: def GET(self): + web.header("Content-Type", "application/json") db = _pyadb._pyadb_open(dbPath, "r") status = _pyadb._pyadb_status(db) results = dict(zip(["numFiles", "dim", "dudCount", "nullCount", "flags", "length", "data_region_size"], status)) @@ -38,16 +41,26 @@ class query: def GET(self): - params = web.input(key="", ntracks=100, seqStart=0, seqLength=16, npoints=1, radius=1.0, hopSize=1) + web.header("Content-Type", "application/json") + params = web.input(key="", ntracks=100, seqStart=0, seqLength=16, npoints=1, radius=1.0, hopSize=1, exhaustive=False, falsePositives=False, accumulation="db", distance="dot", absThres=0, relThres=0, durRatio=0, includeKeys=[], excludeKeys=[]) results = dict() db = _pyadb._pyadb_open(dbPath, "r") + params.includeKeys = map(str, params.includeKeys); + params.excludeKeys = map(str, params.excludeKeys); params.ntracks = int(params.ntracks) params.npoints = int(params.npoints) params.seqStart = int(params.seqStart) params.seqLength = int(params.seqLength) + params.hopSize = int(params.hopSize) params.radius = float(params.radius) - params.hopSize = int(params.hopSize) + params.absThres = float(params.absThres) + params.relThres = float(params.relThres) + params.durRatio = float(params.durRatio) + + if params.includeKeys == []: + del params.includeKeys + try: results = _pyadb._pyadb_queryFromKey(db, **params)