From 5e2694589cfc85c7cf25c15caa3154b5c299777e Mon Sep 17 00:00:00 2001 From: sasha80 Date: Thu, 28 Nov 2024 09:19:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=91=D0=BE=D0=BB=D0=B5=D0=B5=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8=D0=B2=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= =?UTF-8?q?=20=D0=B2=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B5=20=D0=BE=D0=B1?= =?UTF-8?q?=D0=BD=D0=B0=D1=80=D1=83=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20(=D0=BF=D1=80=D0=BE=D0=B4?= =?UTF-8?q?=D0=BE=D0=BB=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scenes/pribor-rtr/pribor-rtr.gd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scenes/pribor-rtr/pribor-rtr.gd b/scenes/pribor-rtr/pribor-rtr.gd index 83cf69a..14d723b 100644 --- a/scenes/pribor-rtr/pribor-rtr.gd +++ b/scenes/pribor-rtr/pribor-rtr.gd @@ -49,11 +49,11 @@ func _on_request_rtr_request_completed(result, _response_code, headers, body: Pa return var pp = ['DeviceDescription', 'DeviceName'] - var ret_val = [null, false] + var ret_val = [null, false, 0] var pp_copy = pp.duplicate(true) tools.get_value_by_path(json_parser.data, pp, ret_val) if not ret_val[1]: - push_error('ошибка: путь %s не найден (%s)' % [pp_copy, headers]) + push_error('путь %s не найден (%s)' % [pp_copy, ret_val[2]]) return var bort_rtr_name_left: StringName = $left.get_meta('DeviceName', '') @@ -90,13 +90,13 @@ func map_value_to_item(data, item, value_name: StringName): return var paths: = Array() map_solid_to_array(meta, paths) - var ret_val: = [null, false] + var ret_val: = [null, false, 0] var paths_copy = paths.duplicate(true) tools.get_value_by_path(data, paths, ret_val) if ret_val[1]: item.set(value_name, ret_val[0]) else: - push_error('ошибка: путь %s для $%s.%s не найден' % [paths_copy, item.name, value_name]) + push_error('путь %s (%s) для $%s.%s (%s) не найден' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) ## 1. Поле [b]'ErCode'[/b] содержит [b]0[/b] - если нет ошибки, и другое значение - если есть ошибка.[br] @@ -112,13 +112,13 @@ func map_error_codes_to_item(data, item, value_name: StringName): var values: = Array() for meta in metas: map_solid_to_array(meta, paths) - var ret_val: = [null, false] + var ret_val: = [null, false, 0] var paths_copy = paths.duplicate(true) tools.get_value_by_path(data, paths, ret_val) if ret_val[1]: values.append(int(ret_val[0])) else: - push_error('ошибка: путь %s для $%s.%s не найден' % [paths_copy, item.name, value_name]) + push_error('путь %s (%s) для $%s.%s (%s) не найден' % [paths_copy, ret_val[2], item.name, value_name, item.tooltip_text]) var test_res = 1 if values.count(int(0)) == values.size() else 2 item.set(value_name, test_res)