diff --git a/qgepqwat2ili/gui/__init__.py b/qgepqwat2ili/gui/__init__.py index df7d0b9e..f2f5be65 100644 --- a/qgepqwat2ili/gui/__init__.py +++ b/qgepqwat2ili/gui/__init__.py @@ -83,7 +83,7 @@ def action_importc(plugin): # neu 26.7.2023 analog action_import global importc_dialog # avoid garbage collection - print("set flagskipvalidation_import") + # print("set flagskipvalidation_import") iface.messageBar().pushMessage("Info", "action import", level=Qgis.Info) @@ -91,7 +91,7 @@ def action_importc(plugin): # # 19.4.2023 add option for additional import configuration def action_do_importc(): - print("Open import dialog config") + # print("Open import dialog config") if importc_dialog.skipvalidation_import: importc_dialog.skipvalidation_import @@ -149,7 +149,7 @@ def action_import(plugin): # Check if validating is selected if flagskipvalidation_import: - print("Validation will be skipped!") + # print("Validation will be skipped!") progress_dialog.setLabelText("No validation of input file...") else: # Validating the input file @@ -199,7 +199,7 @@ def action_import(plugin): # 23.7.2022 rausgenommen - da in ili2db gesetzt # imodel = import_dialog.label_importmodelname.text() tmplabeltext = "Creating ili schema..." + imodel - print(tmplabeltext) + # print(tmplabeltext) # breakpoint() progress_dialog.setLabelText(tmplabeltext) @@ -292,7 +292,7 @@ def action_import(plugin): # imodel, ) else: - # print(imodel) + # # print(imodel) # breakpoint() progress_dialog.close() show_failure( @@ -381,11 +381,11 @@ def action_do_export(): # neu 12.7.2022 emodel = export_dialog.comboBox_modelselection.currentText() - print(emodel) + # print(emodel) # neu 3.4.2023 added float() eorientation = float(export_dialog.comboBox_orientation.currentText()) - print(eorientation) + # print(eorientation) # Prepare file dialog default_folder = QgsSettings().value( @@ -425,7 +425,7 @@ def action_do_export(): check_organisation = False check_organisation = check_organisation_subclass_data() if check_organisation: - print("OK: Integrity checks organisation") + # print("OK: Integrity checks organisation") show_success( "Sucess", "OK: Integrity checks organisation", @@ -433,7 +433,7 @@ def action_do_export(): ) else: progress_dialog.close() - print("number of subclass elements of organisation NOT CORRECT") + # print("number of subclass elements of organisation NOT CORRECT") show_failure( "ERROR: number of subclass elements of organisation NOT CORRECT in schema qgep_od", "Add missing obj_id in organisation subclasses so that number of subclass elements match organisation elements. See qgep logs tab for details.", @@ -448,7 +448,7 @@ def action_do_export(): check_wastewater_structure = False check_wastewater_structure = check_wastewater_structure_subclass_data() if check_wastewater_structure: - print("OK: Integrity checks wastewater_structure") + # print("OK: Integrity checks wastewater_structure") show_success( "Sucess", "OK: Integrity checks wastewater_structure", @@ -456,7 +456,7 @@ def action_do_export(): ) else: progress_dialog.close() - print("ERROR: number of subclass elements of wastewater_structure NOT CORRECT") + # print("ERROR: number of subclass elements of wastewater_structure NOT CORRECT") show_failure( "ERROR: number of subclass elements of wastewater_structure NOT CORRECT in schema qgep_od", "Add missing obj_id in wastewater_structure subclasses so that number of subclass elements match wastewater_structure elements. See qgep logs tab for details.", @@ -469,16 +469,16 @@ def action_do_export(): check_identifier = False check_identifier = check_identifier_null() if check_identifier: - print("OK: Integrity checks identifiers not isNull") + # print("OK: Integrity checks identifiers is not NULL") show_success( "Sucess", - "OK: Integrity checks identifiers not isNull", + "OK: Integrity checks identifiers is not NULL", None, ) else: progress_dialog.close() - print("INFO: missing identifiers") + # print("INFO: missing identifiers") show_hint( "INFO: Missing identifiers in schema qgep_od", "Add missing identifiers to get a valid INTERLIS export file. See qgep logs tab for details.", @@ -492,16 +492,16 @@ def action_do_export(): check_fk_owner = False check_fk_owner = check_fk_owner_null() if check_fk_owner: - print("OK: Integrity checks fk_owner not isNull") + # print("OK: Integrity checks fk_owner is not NULL") show_success( "Sucess", - "OK: Integrity checks fk_owner not isNull", + "OK: Integrity checks fk_owner is not NULL", None, ) else: progress_dialog.close() - print("ERROR: missing MANDATORY fk_owner") + # print("ERROR: missing MANDATORY fk_owner") show_failure( "ERROR: Missing MANDATORY fk_owner in schema qgep_od", "Add missing MANDATORY fk_owner to get a valid INTERLIS export file. See qgep logs tab for details.", @@ -514,16 +514,16 @@ def action_do_export(): check_fk_operator = False check_fk_operator = check_fk_operator_null() if check_fk_operator: - print("OK: Integrity checks fk_operator not isNull") + # print("OK: Integrity checks fk_operator is not NULL") show_success( "Sucess", - "OK: Integrity checks fk_operator not isNull", + "OK: Integrity checks fk_operator is not NULL", None, ) else: progress_dialog.close() - print("ERROR: missing MANDATORY fk_operator") + # print("ERROR: missing MANDATORY fk_operator") show_failure( "ERROR: Missing MANDATORY fk_operator in schema qgep_od", "Add missing MANDATORY fk_operator to get a valid INTERLIS export file. See qgep logs tab for details.", @@ -537,16 +537,16 @@ def action_do_export(): check_fk_dataowner = False check_fk_dataowner = check_fk_dataowner_null() if check_fk_dataowner: - print("OK: Integrity checks fk_dataowner not isNull") + # print("OK: Integrity checks fk_dataowner is not NULL") show_success( "Sucess", - "OK: Integrity checks fk_dataowner not isNull", + "OK: Integrity checks fk_dataowner is not NULL", None, ) else: progress_dialog.close() - print("INFO: missing fk_dataowner") + # print("INFO: missing fk_dataowner") show_hint( "INFO: Missing fk_dataowner in schema qgep_od", "Add missing fk_dataowner to get a valid INTERLIS export file when converting to Release 2020 (will bei MANDATORY). See qgep logs tab for details.", @@ -559,16 +559,16 @@ def action_do_export(): check_fk_provider = False check_fk_provider = check_fk_provider_null() if check_fk_provider: - print("OK: Integrity checks fk_provider not isNull") + # print("OK: Integrity checks fk_provider is not NULL") show_success( "Sucess", - "OK: Integrity checks fk_provider not isNull", + "OK: Integrity checks fk_provider is not NULL", None, ) else: progress_dialog.close() - print("INFO: missing fk_provider") + # print("INFO: missing fk_provider") show_hint( "INFO: Missing fk_provider in schema qgep_od", "Add missing fk_provider to get a valid INTERLIS export file when converting to Release 2020 (will bei MANDATORY). See qgep logs tab for details.", @@ -635,12 +635,12 @@ def action_do_export(): # neu 12.7.2022 progress_dialog.setLabelText(emodel) - # print("GFG printed immediately.") + # # print("GFG # printed immediately.") # time.sleep(5.5) # delays the execution # for 5.5 secs. - # print("GFG printed after 5.5 secs.") + # # print("GFG # printed after 5.5 secs.") progress_dialog.setValue(25) diff --git a/qgepqwat2ili/qgep/export.py b/qgepqwat2ili/qgep/export.py index edfeacf8..c7909e7b 100644 --- a/qgepqwat2ili/qgep/export.py +++ b/qgepqwat2ili/qgep/export.py @@ -190,10 +190,9 @@ def base_common(row, type_name): def wastewater_structure_common(row): """ Returns common attributes for wastewater_structure + ATTENTION : Mapping of 3D wastewater_structure->abwasserbauerk + is not fully implemented. """ - logger.warning( - "Mapping of wastewater_structure->abwasserbauwerk is not fully implemented." - ) return { # --- abwasserbauwerk --- "akten": row.records, @@ -420,9 +419,9 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # accessibility__REL, bypass__REL, emergency_spillway__REL, financing__REL, fk_dataowner__REL, fk_main_cover__REL, fk_main_wastewater_node__REL, fk_operator__REL, fk_owner__REL, fk_provider__REL, function__REL, renovation_necessity__REL, rv_construction_type__REL, status__REL, stormwater_tank_arrangement__REL, structure_condition__REL - logger.warning( - "QGEP field special_structure.upper_elevation has no equivalent in the interlis model. It will be ignored." - ) + + # QGEP field special_structure.upper_elevation is a 3D attribute and has no equivalent in the INTERLIS 2D model release used. It will be ignored for now and not supported with QGEP. + spezialbauwerk = ABWASSER.spezialbauwerk( # FIELDS TO MAP TO ABWASSER.spezialbauwerk # --- baseclass --- @@ -603,9 +602,8 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # fk_dataowner__REL, fk_hydr_geometry__REL, fk_provider__REL, fk_wastewater_structure__REL - logger.warning( - "QGEP field wastewater_node.fk_hydr_geometry has no equivalent in the interlis model. It will be ignored." - ) + # QGEP field wastewater_node.fk_hydr_geometry has no equivalent in the interlis model. It will be ignored. + abwasserknoten = ABWASSER.abwasserknoten( # FIELDS TO MAP TO ABWASSER.abwasserknoten # --- baseclass --- @@ -645,9 +643,8 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # elevation_determination__REL, fk_dataowner__REL, fk_pipe_profile__REL, fk_provider__REL, fk_reach_point_from__REL, fk_reach_point_to__REL, fk_wastewater_structure__REL, horizontal_positioning__REL, inside_coating__REL, material__REL, reliner_material__REL, relining_construction__REL, relining_kind__REL - logger.warning( - "QGEP field reach.elevation_determination has no equivalent in the interlis model. It will be ignored." - ) + # QGEP field reach.elevation_determination has no equivalent in the interlis model. It will be ignored. + haltung = ABWASSER.haltung( # FIELDS TO MAP TO ABWASSER.haltung # --- baseclass --- diff --git a/qgepqwat2ili/qgep/import_.py b/qgepqwat2ili/qgep/import_.py index 3c349cda..e900dec0 100644 --- a/qgepqwat2ili/qgep/import_.py +++ b/qgepqwat2ili/qgep/import_.py @@ -50,7 +50,7 @@ def get_vl_instance(vl_table, value): # TODO : return "other" (or other applicable value) rather than None, or even throwing an exception, would probably be better row = qgep_session.query(vl_table).filter(vl_table.value_de == value).first() if row is None: - logger.warning( + logger.debug( f'Could not find value `{value}` in value list "{vl_table.__table__.schema}.{vl_table.__name__}". Setting to None instead.' ) return None diff --git a/qgepqwat2ili/qgepdss/export.py b/qgepqwat2ili/qgepdss/export.py index 0accffd2..c91eb843 100644 --- a/qgepqwat2ili/qgepdss/export.py +++ b/qgepqwat2ili/qgepdss/export.py @@ -218,10 +218,9 @@ def surface_water_bodies_common(row): def wastewater_structure_common(row): """ Returns common attributes for wastewater_structure + ATTENTION : Mapping of 3D wastewater_structure->abwasserbauerk + is not fully implemented. """ - logger.warning( - "Mapping of wastewater_structure->abwasserbauwerk is not fully implemented." - ) return { # --- abwasserbauwerk --- "akten": row.records, diff --git a/qgepqwat2ili/qgepdss/import_.py b/qgepqwat2ili/qgepdss/import_.py index ffa559fb..537312a8 100644 --- a/qgepqwat2ili/qgepdss/import_.py +++ b/qgepqwat2ili/qgepdss/import_.py @@ -55,7 +55,7 @@ def get_vl_instance(vl_table, value): if row is None: # write logger.warning only if value is not None if value is not None: - logger.warning( + logger.debug( f'Could not find value `{value}` in value list "{vl_table.__table__.schema}.{vl_table.__name__}". Setting to None instead.' ) return None diff --git a/qgepqwat2ili/qgepsia405/export.py b/qgepqwat2ili/qgepsia405/export.py index f6a48e09..251e3128 100644 --- a/qgepqwat2ili/qgepsia405/export.py +++ b/qgepqwat2ili/qgepsia405/export.py @@ -188,10 +188,9 @@ def base_common(row, type_name): def wastewater_structure_common(row): """ Returns common attributes for wastewater_structure + ATTENTION : Mapping of 3D wastewater_structure->abwasserbauerk + is not fully implemented. """ - logger.warning( - "Mapping of wastewater_structure->abwasserbauwerk is not fully implemented." - ) return { # --- abwasserbauwerk --- "akten": row.records, @@ -418,9 +417,9 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # accessibility__REL, bypass__REL, emergency_spillway__REL, financing__REL, fk_dataowner__REL, fk_main_cover__REL, fk_main_wastewater_node__REL, fk_operator__REL, fk_owner__REL, fk_provider__REL, function__REL, renovation_necessity__REL, rv_construction_type__REL, status__REL, stormwater_tank_arrangement__REL, structure_condition__REL - logger.warning( - "QGEP field special_structure.upper_elevation has no equivalent in the interlis model. It will be ignored." - ) + + # QGEP field special_structure.upper_elevation is a 3D attribute and has no equivalent in the INTERLIS 2D model release used. It will be ignored for now and not supported with QGEP. + spezialbauwerk = ABWASSER.spezialbauwerk( # FIELDS TO MAP TO ABWASSER.spezialbauwerk # --- baseclass --- @@ -601,9 +600,8 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # fk_dataowner__REL, fk_hydr_geometry__REL, fk_provider__REL, fk_wastewater_structure__REL - logger.warning( - "QGEP field wastewater_node.fk_hydr_geometry has no equivalent in the interlis model. It will be ignored." - ) + # QGEP field wastewater_node.fk_hydr_geometry has no equivalent in the interlis model. It will be ignored. + abwasserknoten = ABWASSER.abwasserknoten( # FIELDS TO MAP TO ABWASSER.abwasserknoten # --- baseclass --- @@ -643,9 +641,8 @@ def textpos_common(row, t_type, geojson_crs_def): # --- _rel_ --- # elevation_determination__REL, fk_dataowner__REL, fk_pipe_profile__REL, fk_provider__REL, fk_reach_point_from__REL, fk_reach_point_to__REL, fk_wastewater_structure__REL, horizontal_positioning__REL, inside_coating__REL, material__REL, reliner_material__REL, relining_construction__REL, relining_kind__REL - logger.warning( - "QGEP field reach.elevation_determination has no equivalent in the interlis model. It will be ignored." - ) + # QGEP field reach.elevation_determination has no equivalent in the interlis model. It will be ignored. + haltung = ABWASSER.haltung( # FIELDS TO MAP TO ABWASSER.haltung # --- baseclass --- diff --git a/qgepqwat2ili/qgepsia405/import_.py b/qgepqwat2ili/qgepsia405/import_.py index 744401da..6df72e47 100644 --- a/qgepqwat2ili/qgepsia405/import_.py +++ b/qgepqwat2ili/qgepsia405/import_.py @@ -50,7 +50,7 @@ def get_vl_instance(vl_table, value): # TODO : return "other" (or other applicable value) rather than None, or even throwing an exception, would probably be better row = qgep_session.query(vl_table).filter(vl_table.value_de == value).first() if row is None: - logger.warning( + logger.debug( f'Could not find value `{value}` in value list "{vl_table.__table__.schema}.{vl_table.__name__}". Setting to None instead.' ) return None diff --git a/qgepqwat2ili/qwat/export.py b/qgepqwat2ili/qwat/export.py index 8040db09..e54c7025 100644 --- a/qgepqwat2ili/qwat/export.py +++ b/qgepqwat2ili/qwat/export.py @@ -80,10 +80,10 @@ def clamp(val, min_val=None, max_val=None, accept_none=False): if val is None and accept_none: return None if (val is None) or (min_val is not None and val < min_val): - logger.warning(f"Value '{val}' was clamped to {min_val}") + logger.debug(f"Value '{val}' was clamped to {min_val}") val = min_val elif max_val is not None and val > max_val: - logger.warning(f"Value '{val}' was clamped to {max_val}") + logger.debug(f"Value '{val}' was clamped to {max_val}") val = max_val return val @@ -100,11 +100,9 @@ def sanitize_geom(val): return ST_RemoveRepeatedPoints(ST_Force2D(ST_Transform(val, 2056)), 0.002) def create_metaattributes(instance): - logger.warning( - "QWAT doesn't define meta attributes. Dummy metaattributes will be created with an arbitrary date." - ) - - # NOTE : QWAT doesn't define meta attributes, so we create a dummy metattribute + """ + Create dummy meta attributes since QWAT doesn't define these yet + """ metaattribute = WASSER.metaattribute( # FIELDS TO MAP TO WASSER.metaattribute # --- metaattribute --- @@ -343,7 +341,7 @@ def leitungsknoten_common(row): # _rel_ --- leak.label_2_visible__REL, leak.label_1_visible__REL, leak.fk_cause__REL, leak.fk_pipe__REL if row.fk_pipe__REL is None: - logger.warning( + logger.debug( f"Cannot export QWAT.leak {row.id} as it has no related pipe, which are mandatory in SIA405." ) continue @@ -757,9 +755,7 @@ def leitungsknoten_common(row): leitung_b.t_ili_tid = leitung_b.obj_id # We split the geometry - logger.warning( - "Pipe will be split at valve to accomodate SIA405's representation. However, split will occur at the middle of the pipe, not taking into account the actual valve's position" - ) + # Pipe will be split at valve to accomodate SIA405's representation. However, split will occur at the middle of the pipe, not taking into account the actual valve's position # TODO the geometry of the new node does not necessarily lie in the middle (nor on the segment) leitung_a.geometrie = ST_ForceCurve( sanitize_geom(ST_LineSubstring(ST_CurveToLine(leitung_a.geometrie), 0, 0.5)) diff --git a/qgepqwat2ili/utils/ili2db.py b/qgepqwat2ili/utils/ili2db.py index 9e142a04..804d4522 100644 --- a/qgepqwat2ili/utils/ili2db.py +++ b/qgepqwat2ili/utils/ili2db.py @@ -47,9 +47,6 @@ def check_organisation_subclass_data(): logger.info( f"ERROR: number of subclass elements of organisation NOT CORRECT in schema qgep_od: checksum = {organisation_count} (positiv number means missing entries, negativ means too many subclass entries)" ) - print( - f"ERROR: number of subclass elements of organisation NOT CORRECT in schema qgep_od: checksum = {organisation_count} (positiv number means missing entries, negativ means too many subclass entries)" - ) return organisation_subclass_check @@ -90,9 +87,6 @@ def check_wastewater_structure_subclass_data(): logger.info( f"ERROR: number of subclass elements of wastewater_structure NOT CORRECT in schema qgep_od: checksum = {wastewater_structure_count} (positiv number means missing entries, negativ means too many subclass entries)" ) - print( - f"ERROR: number of subclass elements of wastewater_structure NOT CORRECT in schema qgep_od: checksum = {wastewater_structure_count} (positiv number means missing entries, negativ means too many subclass entries)" - ) return wastewater_structure_subclass_check @@ -273,7 +267,6 @@ def check_fk_operator_null(): logger.info( f"ERROR: Missing mandatory fk_operator in qgep_od: {missing_fk_operator_count}" ) - print(f"ERROR: Missing mandatory fk_operator: {missing_fk_operator_count}") return check_fk_operator_null @@ -363,7 +356,6 @@ def check_fk_dataowner_null(): logger.info( f"ERROR: Missing mandatory fk_dataowner in qgep_od: {missing_fk_dataowner_count}" ) - print(f"ERROR: Missing mandatory fk_dataowner: {missing_fk_dataowner_count}") return check_fk_dataowner_null @@ -452,7 +444,6 @@ def check_fk_provider_null(): logger.info( f"ERROR: Missing mandatory fk_provider in qgep_od: {missing_fk_provider_count}" ) - print(f"ERROR: Missing mandatory fk_provider: {missing_fk_provider_count}") return check_fk_provider_null @@ -574,8 +565,7 @@ def get_xtf_model(xtf_file): """ Get XTF model from file """ - logger.info("GET XTF MODEL... ") - print("xtf_file: " + xtf_file) + logger.info(f"GET XTF MODEL {xtf_file} ... ") # logger.info("vorher" + imodel) # funktioniert nicht # global imodel # define imodel as global variable for import model name @@ -605,12 +595,9 @@ def get_xtf_model(xtf_file): else: # checkdatasection = line.find('') # logger.info(str(checkdatasection)) - # print("checkdatasection (ili2db): " + str(checkdatasection)) checkmodelssection = line.find("") - logger.info(str(checkmodelssection)) - print("checkmodelssection (ili2db): " + str(checkmodelssection)) + logger.info("checkmodelssection " + str(checkmodelssection)) logger.info(str(line)) - print(line) else: line2 = f.readline() if not line2: @@ -618,29 +605,21 @@ def get_xtf_model(xtf_file): else: logger.info(str(line2)) logger.info("line2: ", str(line2)) - print(line2) # logger.info(str(checkdatasection)) - # print("checkdatasection (ili2db): " + str(checkdatasection)) logger.info("checkmodelssection2 " + str(checkmodelssection)) - print("checkmodelssection2 (ili2db): " + str(checkmodelssection)) # strmodel = str(line2.strip()) strmodel = str(line2) strmodel = strmodel.strip() - print("strmodel (ili2db): " + strmodel) - print(f"strmodel (ili2db): {strmodel}") logger.info("strmodel: " + strmodel) logger.info("strmodel: ", strmodel) logger.info(f"strmodel: {strmodel}") a = strmodel.find("") logger.info("strmodel.find a : " + str(a)) - print("strmodel.find a : " + str(a)) # if strmodel.find("") > -1: if a == -1: b = strmodel.find("") logger.info(r"strmodel.find b \ -1: - print("strmodel (ili2db): " + strmodel) logger.info("MODELS definition found in xtf: " + strmodel) # # read string between < and . -> eg. VSA_KEK_2019_LV95 @@ -667,15 +646,12 @@ def get_xtf_model(xtf_file): result = result.strip('"') logger.info("MODEL found: " + str(result)) logger.info(result) - print("MODEL found: " + str(result) + "*") model_list.append(result) else: - print("goto next line") + logger.info("goto next line") else: - print(r"<\/MODEL> found - stop checking!") logger.info(" found - stop checking!") break - print(model_list) logger.info("model_list:") logger.info(str(model_list)) @@ -702,7 +678,6 @@ def get_xtf_model(xtf_file): f.close() logger.info("MODEL found: " + str(impmodel)) - print("MODEL found: ", str(impmodel)) # neu 23.7.2022 return imodel from get_xtf_model so it can be called in _init_.py return impmodel @@ -710,7 +685,6 @@ def get_xtf_model(xtf_file): def get_xtf_model2(xtf_file): logger.info("GET XTF MODEL xml version... ") - print("xtf_file: " + xtf_file) # logger.info("vorher" + imodel) # funktioniert nicht # global imodel # define imodel as global variable for import model name @@ -730,7 +704,6 @@ def get_xtf_model2(xtf_file): # from xml file tree = ET.parse(xtf_file) rootinterlis = tree.getroot() - print("rootinterlis.findall:", rootinterlis.findall(".")) logger.info("rootinterlis.findall:", rootinterlis.findall(".")) i = 0 diff --git a/qgepqwat2ili/utils/various.py b/qgepqwat2ili/utils/various.py index 5ee66d02..5deb1967 100644 --- a/qgepqwat2ili/utils/various.py +++ b/qgepqwat2ili/utils/various.py @@ -84,7 +84,7 @@ def setup_test_db(template="full"): def dexec_(cmd, check=True): return exec_(f"docker exec qgepqwat {cmd}", check) - docker_image = os.getenv("QGEPQWAT2ILI_TESTDB_IMAGE", "postgis/postgis:13-3.2") + docker_image = os.getenv("QGEPQWAT2ILI_TESTDB_IMAGE", "postgis/postgis:13-3.4") logger.info(f"SETTING UP QGEP/QWAT DATABASE [{docker_image}]...") @@ -123,10 +123,10 @@ def dexec_(cmd, check=True): # Getting data dexec_( - "wget https://github.com/QGEP/datamodel/releases/download/1.6.0/qgep_1.6.0_structure_and_demo_data.backup" + "wget https://github.com/QGEP/datamodel/releases/download/1.6.2/qgep_1.6.2_structure_and_demo_data.backup" ) dexec_( - "wget https://github.com/QGEP/datamodel/releases/download/1.6.0/qgep_1.6.0_structure_with_value_lists.sql" + "wget https://github.com/QGEP/datamodel/releases/download/1.6.2/qgep_1.6.2_structure_with_value_lists.sql" ) dexec_( "wget https://github.com/qwat/qwat-data-model/releases/download/1.4.0/qwat_v1.4.0_data_and_structure_sample.backup" @@ -139,7 +139,7 @@ def dexec_(cmd, check=True): ) # Creating the template DB with empty structure - dexec_("psql -f qgep_1.6.0_structure_with_value_lists.sql qgep_prod postgres") + dexec_("psql -f qgep_1.6.2_structure_with_value_lists.sql qgep_prod postgres") dexec_("psql -f qwat_v1.4.0_structure_only.sql qgep_prod postgres") dexec_("psql -f qwat_v1.4.0_value_list_data_only.sql qgep_prod postgres") dexec_("createdb -U postgres --template=qgep_prod tpl_empty") @@ -151,7 +151,7 @@ def dexec_(cmd, check=True): dexec_("dropdb -U postgres qgep_prod --if-exists") dexec_("createdb -U postgres qgep_prod") dexec_( - "pg_restore -U postgres --dbname qgep_prod --verbose --no-privileges --exit-on-error qgep_1.6.0_structure_and_demo_data.backup" + "pg_restore -U postgres --dbname qgep_prod --verbose --no-privileges --exit-on-error qgep_1.6.2_structure_and_demo_data.backup" ) dexec_( "pg_restore -U postgres --dbname qgep_prod --verbose --no-privileges --exit-on-error qwat_v1.4.0_data_and_structure_sample.backup"