cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nokia geocoder config moved to the config helper

Browse Source
This commit is contained in:
Mario de Frutos
2016-01-21 08:40:25 +01:00
parent fc35911b91
commit ad9c16b4df
3 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/extension/sql/0.1.0/15_config_helper.sql
+10 -1
View File
@@ -5,10 +5,19 @@ RETURNS boolean AS $$
if cache_key in GD:
return False
else:
import json
from cartodb_geocoder import config_helper
plpy.execute("SELECT cdb_geocoder_server._connect_to_redis('{0}')".format(username))
redis_conn = GD["redis_connection_{0}".format(username)]['redis_metadata_connection']
geocoder_config = config_helper.GeocoderConfig(redis_conn, username, orgname)
heremaps_conf_json = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('heremaps_conf') as heremaps_conf", 1)[0]['heremaps_conf']
if not heremaps_conf_json:
heremaps_app_id = None
heremaps_app_code = None
else:
heremaps_conf = json.loads(heremaps_conf_json)
heremaps_app_id = heremaps_conf['app_id']
heremaps_app_code = heremaps_conf['app_code']
geocoder_config = config_helper.GeocoderConfig(redis_conn, username, orgname, heremaps_app_id, heremaps_app_code)
# --Think about the security concerns with this kind of global cache, it should be only available
# --for this user session but...
GD[cache_key] = geocoder_config