# HG changeset patch # User mas01mj # Date 1253637657 0 # Node ID a6fc780678a817c17ffbe57159a753dfad2a695a # Parent eb91549dda8f8c6fbe6a4bd384cbc0b5e7b927f1 Added support for includeKeys/excludeKeys, et al diff -r eb91549dda8f -r a6fc780678a8 bindings/python/examples/server.py --- 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 """ +audioDB server @@ -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)