From d2a096907e6f9d6de1efce4b6749d82a9a49bdfd Mon Sep 17 00:00:00 2001 From: Mario de Frutos Date: Mon, 23 Nov 2015 09:50:10 +0100 Subject: [PATCH] Removed unused examples for python geocoder library --- .../example/client_func_example.sql | 29 ------------------- .../example/server_func_example.sql | 28 ------------------ 2 files changed, 57 deletions(-) delete mode 100644 server/lib/python/cartodb_geocoder/example/client_func_example.sql delete mode 100644 server/lib/python/cartodb_geocoder/example/server_func_example.sql diff --git a/server/lib/python/cartodb_geocoder/example/client_func_example.sql b/server/lib/python/cartodb_geocoder/example/client_func_example.sql deleted file mode 100644 index 4ae26d0..0000000 --- a/server/lib/python/cartodb_geocoder/example/client_func_example.sql +++ /dev/null @@ -1,29 +0,0 @@ -# cdb_conf geocoder config example -INSERT INTO cdb_conf VALUES ('geocoder_conf', '{"geocoder_db": {"host": "localhost", "port": "5432", db": "cartodb_dev_user_274bf952-8568-4598-9efd-be92ed3d2ead_db", "user": "development_cartodb_user_274bf952-8568-4598-9efd-be92ed3d2ead"}, "redis": {"host": "localhost", "port": 6379, "db": 5 } }') - -CREATE OR REPLACE FUNCTION cartodb._geocoder_admin0_polygons(search text) - RETURNS Geometry AS -$$ - db_connection_str = plpy.execute("SELECT * FROM cartodb._Geocoder_Server_Conf() conf;")[0]['conf'] - return plpy.execute("SELECT cartodb._Geocoder_Admin0_Polygons('{0}', session_user, txid_current(), '{1}') as geom".format(search, db_connection_str))[0]['geom'] -$$ LANGUAGE plpythonu SECURITY DEFINER; - -CREATE OR REPLACE -FUNCTION cartodb._geocoder_server_conf() - RETURNS text AS -$$ - conf = plpy.execute("SELECT cartodb.CDB_Conf_GetConf('geocoder_conf') conf")[0]['conf'] - if conf is None: - raise "There is no geocoder server configuration " - else: - import json - params = json.loads(conf) - db_params = params['geocoder_db'] - return "host={0} port={1} dbname={2} user={3}".format(db_params['host'],db_params['port'],db_params['db'],db_params['user']) -$$ LANGUAGE 'plpythonu'; - -CREATE OR REPLACE FUNCTION cartodb._geocoder_admin0_polygons(search text, user_id name, tx_id bigint, db_connection_str text) -RETURNS Geometry AS $$ - CONNECT db_connection_str; - SELECT geocode_admin0(search, tx_id, user_id); -$$ LANGUAGE plproxy; \ No newline at end of file diff --git a/server/lib/python/cartodb_geocoder/example/server_func_example.sql b/server/lib/python/cartodb_geocoder/example/server_func_example.sql deleted file mode 100644 index 564268c..0000000 --- a/server/lib/python/cartodb_geocoder/example/server_func_example.sql +++ /dev/null @@ -1,28 +0,0 @@ -CREATE OR REPLACE -FUNCTION geocode_admin0(search text, tx_id bigint, user_id name) - RETURNS Geometry AS -$$ - import logging - from cartodb_geocoder import quota_service - - LOG_FILENAME = '/tmp/plpython.log' - logging.basicConfig(filename=LOG_FILENAME,level=logging.DEBUG) - - if user_id in SD and tx_id in SD[user_id] and 'redis_connection' in SD[user_id][tx_id]: - logging.debug("Using redis cached connection...") - qs = quota_service.QuotaService(user_id, tx_id, redis_connection=SD[user_id][tx_id]['redis_connection']) - else: - qs = quota_service.QuotaService(user_id, tx_id, redis_host='localhost', redis_port=6379, redis_db=5) - - if qs.check_user_quota(): - result = plpy.execute("SELECT geom FROM geocode_admin0_polygons(Array[\'{0}\']::text[])".format(search)) - if result.status() == 5 and result.nrows() == 1: - qs.increment_geocoder_use() - SD[user_id] = {tx_id: {'redis_connection': qs.user_service.redis_connection}} - return result[0]["geom"] - else: - raise Exception('Something wrong with the georefence operation') - else: - raise Exception('Not enough quota for this user') - -$$ LANGUAGE plpythonu; \ No newline at end of file