aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/db/call.py5
-rw-r--r--wqflask/wqflask/search_results.py15
2 files changed, 5 insertions, 15 deletions
diff --git a/wqflask/db/call.py b/wqflask/db/call.py
index b380b520..ac9f7fe5 100644
--- a/wqflask/db/call.py
+++ b/wqflask/db/call.py
@@ -29,7 +29,8 @@ when set.
return fetchone(query)
def fetchone(query):
- """Return tuple containing one row by calling SQL directly
+ """Return tuple containing one row by calling SQL directly (the
+original fetchone, but with logging)
"""
with Bench("SQL",LOG_SQL):
@@ -47,5 +48,5 @@ def gn_server(path):
res = urllib2.urlopen(GN_SERVER_URL+path)
rest = res.read()
res2 = json.loads(rest)
- logger.info(res2)
+ logger.debug(res2)
return res2
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index c15a98c5..c1b8683e 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -10,8 +10,6 @@ import re
import uuid
from math import *
import time
-#import pyXLWriter as xl
-#import pp - Note from Sam: is this used?
import math
import datetime
import collections
@@ -20,13 +18,9 @@ from pprint import pformat as pf
import json
-from flask import Flask, g
-from MySQLdb import escape_string as escape
+# from flask import Flask, g
-# Instead of importing HT we're going to build a class below until we can eliminate it
-# from htmlgen import HTMLgen2 as HT
-
-from utility.benchmark import Bench
+# from utility.benchmark import Bench
from base.data_set import create_dataset
from base.trait import GeneralTrait
from wqflask import parser
@@ -39,11 +33,6 @@ from utility import formatting
from utility.logger import getLogger
logger = getLogger(__name__ )
-#class QuickSearchResult(object):
- #def __init__(self, key, result_fields):
- # self.key = key
- # self.result_fields = result_fields
-
class SearchResultPage(object):
#maxReturn = 3000