Merge d55f9e2 into 8a77588

datosgobar · Jul 10, 2018 · d209ee5 · d209ee5
2 parents 8a77588 + d55f9e2
commit d209ee5
Show file tree

Hide file tree

Showing 3 changed files with 15,241 additions and 12 deletions.
diff --git a/pydatajson/indicators.py b/pydatajson/indicators.py
@@ -83,26 +83,25 @@ def generate_catalogs_indicators(catalogs, central_catalog=None,
         if central_catalog:
             result.update(_federation_indicators(catalog,
                                                  central_catalog))
-
-        indicators_list.append(result)
+        if not indicators_list:
+            # La primera iteracion solo copio el primer resultado
+            network_indicators = result.copy()
+        else:
+            network_indicators = helpers.add_dicts(network_indicators,
+                                                   result)
         # Sumo a la cuenta total de campos usados/totales
         fields = helpers.add_dicts(fields_count, fields)
 
-    # Indicadores de la red entera
-    network_indicators = {
-        'catalogos_cant': catalogs_cant
-    }
+        result['title'] = catalog.get('title', 'no-title')
+        result['identifier'] = catalog.get('identifier', 'no-id')
+        indicators_list.append(result)
 
     if not indicators_list:
         # No se pudo leer ningún catálogo
         return [], {}
 
-    # Sumo los indicadores individuales al total
-    indicators_total = indicators_list[0].copy()
-    for i in range(1, len(indicators_list)):
-        indicators_total = helpers.add_dicts(indicators_total,
-                                             indicators_list[i])
-    network_indicators.update(indicators_total)
+    # Indicadores de la red entera
+    network_indicators['catalogos_cant'] = catalogs_cant
     # Genero los indicadores de la red entera,
     _network_indicator_percentages(fields, network_indicators)