changeset 631:6ec50185b348

Fixed up repr/str

* server.py uses rawData for now
* __repr__ and __str__ return correctly

--- a/bindings/python/examples/server.py	Wed Sep 23 16:19:42 2009 +0000
+++ b/bindings/python/examples/server.py	Wed Sep 23 16:44:27 2009 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-import _pyadb
+from pyadb import *
 import web
 import json
 import sys
@@ -34,7 +34,7 @@
 class status:
 	def GET(self):
 		web.header("Content-Type", "application/json") 
-		db = _pyadb._pyadb_open(dbPath, "r")
+		db = Pyadb(path = dbPath, mode = "r")
 		status = _pyadb._pyadb_status(db)
 		results = dict(zip(["numFiles", "dim", "dudCount", "nullCount", "flags", "length", "data_region_size"], status))
 		return json.dumps(dict(status = "ok", data = results))
@@ -44,30 +44,33 @@
 		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")
+		db = Pyadb(path = dbPath, mode = "r")
+		
+		if not params.includeKeys == []:
+			db.configQuery["includeKeys"] = map(str, params.includeKeys)
+		
+		if params.excludeKeys:
+			foo = map(str, params.excludeKeys)
+			db.configQuery["excludeKeys"] = foo 
 
-		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.absThres = float(params.absThres)
-		params.relThres = float(params.relThres)
-		params.durRatio = float(params.durRatio)
+		db.configQuery["ntracks"] = int(params.ntracks)
+		db.configQuery["npoints"] = int(params.npoints)
+		db.configQuery["seqStart"] = int(params.seqStart)
+		db.configQuery["seqLength"] = int(params.seqLength)
+		db.configQuery["hopSize"] = int(params.hopSize)
+		db.configQuery["radius"] = float(params.radius)
+		db.configQuery["absThres"] = float(params.absThres)
+		db.configQuery["relThres"] = float(params.relThres)
+		db.configQuery["durRatio"] = float(params.durRatio)
+		db.configQuery["resFmt"] = "dict" 
 		
-		if params.includeKeys == []:
-			del params.includeKeys
 
 		
 		try:
-			results = _pyadb._pyadb_queryFromKey(db, **params) 
+			results = db.query(key = params.key)
 		except Exception as inst:
 			return json.dumps(dict(status = "error", message=str(inst)))
-
-		return json.dumps(dict(status = "ok", data = results))
+		return json.dumps(dict(status = "ok", data = results.rawData))
 
 if __name__ == "__main__": 
 	app.run()

--- a/bindings/python/pyadb.py	Wed Sep 23 16:19:42 2009 +0000
+++ b/bindings/python/pyadb.py	Wed Sep 23 16:44:27 2009 +0000
@@ -157,9 +157,9 @@
 			else:
 				self.type = "dict"
 		def __str__(self):
-			str(self.rawData)
+			return str(self.rawData)
 		def __repr__(self):
-			repr(self.rawData)
+			return repr(self.rawData)
 
 class untitledTests(unittest.TestCase):
 	def setUp(self):