From 06d31f34f4d181185578084a074153a6e3f77602 Mon Sep 17 00:00:00 2001 From: Ludee Date: Mon, 29 Oct 2018 16:53:11 +0100 Subject: [PATCH] update adapters --- database_adapter/reeem_adapter_times_paneu.py | 37 ++++--- database_setup/reeem_db_setup_energypro.sql | 97 +++++++++++++++++-- database_setup/reeem_db_setup_times_paneu.sql | 2 - 3 files changed, 109 insertions(+), 27 deletions(-) diff --git a/database_adapter/reeem_adapter_times_paneu.py b/database_adapter/reeem_adapter_times_paneu.py index c5cedcb..4f99190 100644 --- a/database_adapter/reeem_adapter_times_paneu.py +++ b/database_adapter/reeem_adapter_times_paneu.py @@ -10,24 +10,31 @@ from reeem_io import * # input -# filename = "" -filename = "2018-07-19_Base_TIMESPanEU_FrameworkV1_DataV3_Output.xlsx" -# filename = "2018-07-10_HighRES_TIMESPanEU_FrameworkV2_DataV1_Output.xlsx" + +# filename = "2017-10-27_Pilot_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" +# filename = "2017-10-27_Pilot_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" + +# filename = "2017-11-15_HighRES_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" +# filename = "2017-11-15_HighRES_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" +# filename = "2017-11-15_HighRES_TIMESPanEU_FrameworkV1_DataV2_Output.xlsx" #MISSING! # filename = "2018-07-10_HighRES_TIMESPanEU_FrameworkV1_DataV3_Output.xlsx" -# filename = "2018-07-10_Base_TIMESPanEU_FrameworkV2_DataV1_Output.xlsx" -# filename = "2018-08-01_Base_TIMESPanEU_FrameworkV1_DataV3_Input.xlsx" -# filename = "2018-01-16_Base_TIMESPanEU_FrameworkV1_DataV2_Output.xlsx" -# filename = "2018-01-16_Base_TIMESPanEU_FrameworkV1_DataV2_Input.xlsx" -# filename = "2017-11-15_StorageInnov_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" +# filename = "2018-07-10_HighRES_TIMESPanEU_FrameworkV2_DataV1_Output.xlsx" + # filename = "2017-11-15_StorageInnov_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" -# filename = "2017-11-15_HighRES_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" -# filename = "2017-11-15_HighRES_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" -# filename = "2017-11-15_Base_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" +# filename = "2017-11-15_StorageInnov_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" + # filename = "2017-11-15_Base_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" -# filename = "2017-11-15_Base(withRen.Target)_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" -# filename = "2017-10-27_Pilot2_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" -# filename = "2017-10-27_Pilot_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" -# filename = "2017-10-27_Pilot_TIMESPanEU_FrameworkV1_DataV1_Input.xlsx" +# filename = "2017-11-15_Base_TIMESPanEU_FrameworkV1_DataV1_Output.xlsx" + +# filename = "2018-01-16_Base_TIMESPanEU_FrameworkV1_DataV2_Input.xlsx" +# filename = "2018-01-16_Base_TIMESPanEU_FrameworkV1_DataV2_Output.xlsx" + +# filename = "2018-07-10_Base_TIMESPanEU_FrameworkV2_DataV1_Input.xlsx" #SP? +# filename = "2018-07-10_Base_TIMESPanEU_FrameworkV2_DataV1_Output.xlsx" + +# filename = "2018-08-01_Base_TIMESPanEU_FrameworkV1_DataV3_Input.xlsx" +# filename = "2018-07-19_Base_TIMESPanEU_FrameworkV1_DataV3_Output.xlsx" + # regions = ['AT'] regions = ['EU28', 'AT', 'BE', 'BG', 'CY', 'CZ', 'DE', 'DK', 'EE', 'ES', diff --git a/database_setup/reeem_db_setup_energypro.sql b/database_setup/reeem_db_setup_energypro.sql index 4631160..8381d09 100644 --- a/database_setup/reeem_db_setup_energypro.sql +++ b/database_setup/reeem_db_setup_energypro.sql @@ -8,11 +8,11 @@ __copyright__ = "© Reiner Lemoine Institut" __license__ = "GNU Affero General Public License Version 3 (AGPL-3.0)" __url__ = "https://www.gnu.org/licenses/agpl-3.0.en.html" __author__ = "Ludwig Hülk" -__issue__ = "https://github.com/ReeemProject/reeem_db/issues/7" +__issue__ = "https://github.com/ReeemProject/reeem_db/issues/8" * This file is part of project REEEM (https://github.com/ReeemProject/reeem_db). * It's copyrighted by the contributors recorded in the version control history: - * ReeemProject/reeem_db/database_setup/reeem_db_setup_ecosense.sql + * ReeemProject/reeem_db/database_setup/reeem_db_setup_energypro.sql * * SPDX-License-Identifier: AGPL-3.0-or-later */ @@ -22,8 +22,8 @@ __issue__ = "https://github.com/ReeemProject/reeem_db/issues/7" DROP TABLE IF EXISTS model_draft.reeem_energypro_input CASCADE; CREATE TABLE model_draft.reeem_energypro_input ( "id" serial NOT NULL, - "dfid" integer, "nid" integer, + "dfid" integer, "pathway" text, "framework" text, "version" text, @@ -60,12 +60,12 @@ COMMENT ON TABLE model_draft.reeem_energypro_input IS "sources": [ {"name": "", "description": "", "url": "", "license": "", "copyright": ""} ], "license": - {"id": "", - "name": "", - "version": "", - "url": "", - "instruction": "", - "copyright": ""}, + {"id": "tba", + "name": "tba", + "version": "tba", + "url": "tba", + "instruction": "tba", + "copyright": "tba"}, "contributors": [ {"name": "Ludee", "email": "none", "date": "2018-10-02", "comment": "Create table"} ], "resources": [ @@ -73,8 +73,8 @@ COMMENT ON TABLE model_draft.reeem_energypro_input IS "format": "PostgreSQL", "fields": [ {"name": "id", "description": "Unique identifier", "unit": "none"}, - {"name": "dfid", "description": "Row id", "unit": "none"}, {"name": "nid", "description": "Model id", "unit": "none"}, + {"name": "dfid", "description": "Row id", "unit": "none"}, {"name": "pathway", "description": "REEEM pathway", "unit": "none"}, {"name": "framework", "description": "REEEM framework", "unit": "none"}, {"name": "version", "description": "REEEM version", "unit": "none"}, @@ -92,3 +92,80 @@ COMMENT ON TABLE model_draft.reeem_energypro_input IS -- scenario log (version,io,schema_name,table_name,script_name,comment) SELECT scenario_log('REEEM','v0.2.0','setup','model_draft','reeem_energypro_input','reeem_db_setup_energypro.sql',' '); + + + +-- EnergyPRO Input +DROP TABLE IF EXISTS model_draft.reeem_energypro_output CASCADE; +CREATE TABLE model_draft.reeem_energypro_output ( + "id" serial NOT NULL, + "nid" integer, + "dfid" integer, + "pathway" text, + "framework" text, + "version" text, + "region" text, + "year" smallint, + "field" text, + "category" text, + "indicator" text, + "value" double precision, + "unit" text, + "aggregation" boolean, + "tags" hstore, + "updated" timestamp with time zone, + CONSTRAINT reeem_energypro_output_pkey PRIMARY KEY (id) ); + +-- access rights +ALTER TABLE model_draft.reeem_energypro_output OWNER TO reeem_user; +GRANT SELECT ON TABLE model_draft.reeem_energypro_output TO reeem_read WITH GRANT OPTION; + +-- metadata +COMMENT ON TABLE model_draft.reeem_energypro_output IS + '{"title": "REEEM EnergyPRO Input", + "description": "", + "language": [ "eng" ], + "spatial": + {"location": "", + "extent": "", + "resolution": ""}, + "temporal": + {"reference_date": "2020", + "start": "2020", + "end": "2050", + "resolution": "erratic(2020;2030;2050)"}, + "sources": [ + {"name": "EnergyPro", "description": "", "url": "", "license": "", "copyright": ""} ], + "license": + {"id": "tba", + "name": "tba", + "version": "tba", + "url": "tba", + "instruction": "tba", + "copyright": "tba"}, + "contributors": [ + {"name": "Ludee", "email": "none", "date": "2018-10-25", "comment": "Create table"} ], + "resources": [ + {"name": "model_draft.reeem_energypro_output", + "format": "PostgreSQL", + "fields": [ + {"name": "id", "description": "Unique identifier", "unit": "none"}, + {"name": "nid", "description": "Model id", "unit": "none"}, + {"name": "dfid", "description": "Row id", "unit": "none"}, + {"name": "pathway", "description": "REEEM pathway", "unit": "none"}, + {"name": "framework", "description": "REEEM framework", "unit": "none"}, + {"name": "version", "description": "REEEM version", "unit": "none"}, + {"name": "region", "description": "Country", "unit": "none"}, + {"name": "year", "description": "Year", "unit": "none"}, + {"name": "field", "description": "2. classification", "unit": "none"}, + {"name": "category", "description": "3. classification", "unit": "none"}, + {"name": "indicator", "description": "Parameter name", "unit": "none"}, + {"name": "value", "description": "Parameter value", "unit": "unit"}, + {"name": "unit", "description": "Parameter unit", "unit": "none"}, + {"name": "aggregation", "description": "True if aggregated", "unit": "none"}, + {"name": "tags", "description": "Free classification", "unit": "none"}, + {"name": "updated", "description": "Timestamp", "unit": "none"} ] } ], + "metadata_version": "1.3"}'; + +-- scenario log (version,io,schema_name,table_name,script_name,comment) +SELECT scenario_log('REEEM','v0.2.0','setup','model_draft','reeem_energypro_output','reeem_db_setup_energypro.sql',' '); diff --git a/database_setup/reeem_db_setup_times_paneu.sql b/database_setup/reeem_db_setup_times_paneu.sql index fe502e6..7e74c71 100644 --- a/database_setup/reeem_db_setup_times_paneu.sql +++ b/database_setup/reeem_db_setup_times_paneu.sql @@ -4,8 +4,6 @@ TIMES PanEU Table Setup TIMES PanEU Input TIMES PanEU Output -https://github.com/ReeemProject/reeem_db/issues/4 - __copyright__ = "© Reiner Lemoine Institut" __license__ = "GNU Affero General Public License Version 3 (AGPL-3.0)" __url__ = "https://www.gnu.org/licenses/agpl-3.0.en.html"