enpaiva commited on
Commit
7cd2a08
·
verified ·
1 Parent(s): c1d29c5

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +9 -9
app.py CHANGED
@@ -16,32 +16,32 @@ def get_ied_ip(root, ns, ied_name):
16
  return None
17
 
18
  def process_da_type(children_dict, da_type_id, datype_cache, ns):
19
- """Procesa recursivamente DAType para extraer todos BDA (Basic Data Attributes)"""
20
  da_type_elem = datype_cache.get(da_type_id)
21
  if da_type_elem is None:
22
  return
23
 
24
- # Procesar Basic Data Attributes (BDA)
25
  for bda in da_type_elem.findall('scl:BDA', ns):
26
  bda_name = bda.get('name')
27
  bda_type = bda.get('type', '')
28
  bda_btype = bda.get('bType', '')
29
 
30
  bda_data = {
31
- '_type': 'Basic Data Attribute',
32
- '_type_short': 'BDA',
33
  '_display': bda_name,
34
  '_children': {}
35
  }
36
 
37
- # Si el BDA tiene un tipo complejo, procesarlo recursivamente
38
  if bda_type and bda_type in datype_cache:
39
  process_da_type(bda_data['_children'], bda_type, datype_cache, ns)
40
 
41
  children_dict[bda_name] = bda_data
42
 
43
  def process_do_type(children_dict, do_type_id, dotype_cache, datype_cache, ns):
44
- """Procesa recursivamente DOType para extraer todos DA y SDO"""
45
  do_type_elem = dotype_cache.get(do_type_id)
46
  if do_type_elem is None:
47
  return
@@ -68,14 +68,14 @@ def process_do_type(children_dict, do_type_id, dotype_cache, datype_cache, ns):
68
 
69
  children_dict[da_name] = da_data
70
 
71
- # Procesar Sub Data Objects (SDO)
72
  for sdo in do_type_elem.findall('scl:SDO', ns):
73
  sdo_name = sdo.get('name')
74
  sdo_type = sdo.get('type')
75
 
76
  sdo_data = {
77
- '_type': 'Sub Data Object',
78
- '_type_short': 'SDO',
79
  '_display': sdo_name,
80
  '_children': {}
81
  }
 
16
  return None
17
 
18
  def process_da_type(children_dict, da_type_id, datype_cache, ns):
19
+ """Procesa recursivamente DAType para extraer todos DA anidados"""
20
  da_type_elem = datype_cache.get(da_type_id)
21
  if da_type_elem is None:
22
  return
23
 
24
+ # Procesar DA anidados (antes BDA)
25
  for bda in da_type_elem.findall('scl:BDA', ns):
26
  bda_name = bda.get('name')
27
  bda_type = bda.get('type', '')
28
  bda_btype = bda.get('bType', '')
29
 
30
  bda_data = {
31
+ '_type': 'Data Attribute', # Cambio: era 'Basic Data Attribute'
32
+ '_type_short': 'DA', # Cambio: era 'BDA'
33
  '_display': bda_name,
34
  '_children': {}
35
  }
36
 
37
+ # Si el DA tiene un tipo complejo, procesarlo recursivamente
38
  if bda_type and bda_type in datype_cache:
39
  process_da_type(bda_data['_children'], bda_type, datype_cache, ns)
40
 
41
  children_dict[bda_name] = bda_data
42
 
43
  def process_do_type(children_dict, do_type_id, dotype_cache, datype_cache, ns):
44
+ """Procesa recursivamente DOType para extraer todos DA"""
45
  do_type_elem = dotype_cache.get(do_type_id)
46
  if do_type_elem is None:
47
  return
 
68
 
69
  children_dict[da_name] = da_data
70
 
71
+ # Procesar Sub Data Objects como DA (Cambio: SDO ahora es DA)
72
  for sdo in do_type_elem.findall('scl:SDO', ns):
73
  sdo_name = sdo.get('name')
74
  sdo_type = sdo.get('type')
75
 
76
  sdo_data = {
77
+ '_type': 'Data Attribute', # Cambio: era 'Sub Data Object'
78
+ '_type_short': 'DA', # Cambio: era 'SDO'
79
  '_display': sdo_name,
80
  '_children': {}
81
  }