Skip to content

Commit f1cdb46

Browse files
committed
Change warnings into debug messages. See CLARIAH#350
1 parent fab2250 commit f1cdb46

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/gquery.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,30 @@ def guess_endpoint_uri(rq, loader):
3737

3838
if has_request_context() and "endpoint" in request.args:
3939
endpoint = request.args['endpoint']
40-
glogger.info("Endpoint provided in request: " + endpoint)
40+
glogger.debug("Endpoint provided in request: " + endpoint)
4141
return endpoint, auth
4242

4343
# Decorator
4444
try:
4545
decorators = get_yaml_decorators(rq)
4646
endpoint = decorators['endpoint']
4747
auth = None
48-
glogger.info("Decorator guessed endpoint: " + endpoint)
48+
glogger.debug("Decorator guessed endpoint: " + endpoint)
4949
except (TypeError, KeyError):
5050
# File
5151
try:
5252
endpoint_content = loader.getEndpointText()
5353
endpoint = endpoint_content.strip().splitlines()[0]
5454
auth = None
55-
glogger.info("File guessed endpoint: " + endpoint)
55+
glogger.debug("File guessed endpoint: " + endpoint)
5656
# TODO: except all is really ugly
5757
except:
5858
# Default
5959
endpoint = static.DEFAULT_ENDPOINT
6060
auth = (static.DEFAULT_ENDPOINT_USER, static.DEFAULT_ENDPOINT_PASSWORD)
6161
if auth == ('none', 'none'):
6262
auth = None
63-
glogger.warning("No endpoint specified, using default ({})".format(endpoint))
63+
glogger.debug("No endpoint specified, using default ({})".format(endpoint))
6464

6565
return endpoint, auth
6666

@@ -175,7 +175,7 @@ def get_parameters(rq, variables, endpoint, query_metadata, auth=None):
175175
if vdefault is not None:
176176
parameters[vname]['default'] = vdefault
177177

178-
glogger.info('Finished parsing the following parameters: {}'.format(parameters))
178+
glogger.debug('Finished parsing the following parameters: {}'.format(parameters))
179179

180180
return parameters
181181

@@ -213,7 +213,7 @@ def get_enumeration_sparql(rq, v, endpoint, auth=None):
213213
"""
214214
Returns a list of enumerated values for variable 'v' in query 'rq'
215215
"""
216-
glogger.info('Retrieving enumeration for variable {}'.format(v))
216+
glogger.debug('Retrieving enumeration for variable {}'.format(v))
217217
vcodes = []
218218
# tpattern_matcher = re.compile(".*(FROM\s+)?(?P<gnames>.*)\s+WHERE.*[\.\{][\n\t\s]*(?P<tpattern>.*\?" + re.escape(v) + ".*?\.).*", flags=re.DOTALL)
219219
# tpattern_matcher = re.compile(".*?((FROM\s*)(?P<gnames>(\<.*\>)+))?\s*WHERE\s*\{(?P<tpattern>.*)\}.*", flags=re.DOTALL)
@@ -346,9 +346,9 @@ def get_metadata(rq, endpoint):
346346

347347
try:
348348
# update query
349-
glogger.info("Trying to parse UPDATE query")
349+
glogger.debug("Trying to parse UPDATE query")
350350
parsed_query = UpdateUnit.parseString(rq, parseAll=True)
351-
glogger.info(parsed_query)
351+
glogger.debug(parsed_query)
352352
query_metadata['type'] = parsed_query[0]['request'][0].name
353353
if query_metadata['type'] == 'InsertData':
354354
query_metadata['parameters'] = {
@@ -357,7 +357,7 @@ def get_metadata(rq, endpoint):
357357
'data': {'datatype': None, 'enum': [], 'lang': None, 'name': 'data', 'original': '?_data',
358358
'required': True, 'type': 'literal'}}
359359

360-
glogger.info("Update query parsed with {}".format(query_metadata['type']))
360+
glogger.debug("Update query parsed with {}".format(query_metadata['type']))
361361
# if query_metadata['type'] == 'InsertData':
362362
# query_metadata['variables'] = parsed_query.algebra['PV']
363363
except Exception as e:
@@ -378,7 +378,7 @@ def paginate_query(query, results_per_page, get_args):
378378
split display a maximum of `results_per_page`."""
379379
page = get_args.get('page', 1)
380380

381-
glogger.info("Paginating query for page {}, {} results per page".format(page, results_per_page))
381+
glogger.debug("Paginating query for page {}, {} results per page".format(page, results_per_page))
382382

383383
# If contains LIMIT or OFFSET, remove them
384384
glogger.debug("Original query: " + query)

0 commit comments

Comments
 (0)