merging

Merge branch 'master' of ghghgh.us:photoblaster/photoblaster

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/db.py b/lib/db.py
index a236344..6a7e424 100644
--- a/lib/db.py
+++ b/lib/db.py
@@ -2,6 +2,7 @@
 """all database connections and logic goes here"""
 from config import DB_HOST, DB_USER, DB_PASSWORD, DB_NAME
 import time, sys
+import simplejson as json
 
 from sqlalchemy import Column, Integer, LargeBinary, String, create_engine, sql
 from sqlalchemy.ext.declarative import declarative_base
@@ -37,6 +38,11 @@ class Db(object):
         ))
         self.Session = sessionmaker(bind=engine)
 
+    def search(self, **kwargs):
+        session = self.Session()
+        results = session.query(ImCmd).filter_by(**kwargs).all()
+        return map(lambda n: { "tag": n.tag, "data": json.loads(n.dataobj) }, results)
+
     def insert_cmd(self, **kwargs):
         try:
             session = self.Session()