aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wqflask/base/data_set.py1
-rw-r--r--wqflask/db/call.py69
-rw-r--r--wqflask/db/gn_server.py7
-rw-r--r--wqflask/wqflask/submit_bnw.py10
4 files changed, 0 insertions, 87 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 57bd6be3..433365fc 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -22,7 +22,6 @@ from dataclasses import field
from dataclasses import InitVar
from typing import Optional, Dict, List
from utility.tools import USE_GN_SERVER, USE_REDIS, flat_files, flat_file_exists, GN2_BASE_URL
-from db.gn_server import menu_main
from pprint import pformat as pf
from utility.db_tools import escape
from utility.db_tools import mescape
diff --git a/wqflask/db/call.py b/wqflask/db/call.py
deleted file mode 100644
index c27e0326..00000000
--- a/wqflask/db/call.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Module for calling the backend
-
-from flask import g
-
-import string
-try: # Python2 support
- import urllib.request
- import urllib.error
- import urllib.parse
-except:
- import urllib2
-import json
-from utility.tools import USE_GN_SERVER, LOG_SQL, GN_SERVER_URL
-
-from utility.logger import getLogger
-logger = getLogger(__name__)
-
-
-def fetch1(query, path=None, func=None):
- """Fetch one result as a Tuple using either a SQL query or the URI
-path to GN_SERVER (when USE_GN_SERVER is True). Apply func to
-GN_SERVER result when set (which should return a Tuple)
-
- """
- if USE_GN_SERVER and path:
- result = gn_server(path)
- if func != None:
- res2 = func(result)
- else:
- res2 = result,
- return res2
- else:
- return fetchone(query)
-
-
-def fetchone(query):
- """Return tuple containing one row by calling SQL directly (the
-original fetchone, but with logging)
-
- """
- def helper(query):
- res = g.db.execute(query)
- return res.fetchone()
- return logger.sql(query, helper)
-
-
-def fetchall(query):
- """Return row iterator by calling SQL directly (the
-original fetchall, but with logging)
-
- """
- def helper(query):
- res = g.db.execute(query)
- return res.fetchall()
- return logger.sql(query, helper)
-
-
-def gn_server(path):
- """Return JSON record by calling GN_SERVER
-
- """
- res = ()
- try:
- res = urllib.request.urlopen(GN_SERVER_URL + path)
- except:
- res = urllib2.urlopen(GN_SERVER_URL + path)
- rest = res.read()
- res2 = json.loads(rest)
- return res2
diff --git a/wqflask/db/gn_server.py b/wqflask/db/gn_server.py
deleted file mode 100644
index af6682ba..00000000
--- a/wqflask/db/gn_server.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Backend query functions (logic)
-
-from db.call import gn_server
-
-
-def menu_main():
- return gn_server("/int/menu/main.json")
diff --git a/wqflask/wqflask/submit_bnw.py b/wqflask/wqflask/submit_bnw.py
deleted file mode 100644
index b21a88cc..00000000
--- a/wqflask/wqflask/submit_bnw.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from base.trait import GeneralTrait
-from base import data_set
-from utility import helper_functions
-
-import utility.logger
-logger = utility.logger.getLogger(__name__)
-
-
-def get_bnw_input(start_vars):
- logger.debug("BNW VARS:", start_vars)