* Flexibiliza métodos de búsqueda optimizados para aceptar data.json'…

…s versión 1.0
datosgobar · Apr 17, 2018 · 6c9a13f · 6c9a13f
1 parent 5453c7e
commit 6c9a13f
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,6 +1,11 @@
 Versiones
 =========
 
+0.4.7 (2018-04-17)
+-------------------
+
+* Flexibiliza métodos de búsqueda optimizados para aceptar data.json's versión 1.0
+
 0.4.6 (2018-04-17)
 -------------------
 

diff --git a/pydatajson/__init__.py b/pydatajson/__init__.py
@@ -12,4 +12,4 @@
 
 __author__ = """Datos Argentina"""
 __email__ = 'datos@modernizacion.gob.ar'
-__version__ = '0.4.6'
+__version__ = '0.4.7'
diff --git a/pydatajson/core.py b/pydatajson/core.py
@@ -137,10 +137,11 @@ def _build_datasets_index(self):
     def _build_distributions_index(self):
         distributions_index = {}
         for index, distribution in enumerate(self.distributions):
-            distributions_index[distribution["identifier"]] = {
-                "index": index,
-                "dataset_identifier": distribution["dataset_identifier"]
-            }
+            if "identifier" in distribution:
+                distributions_index[distribution["identifier"]] = {
+                    "index": index,
+                    "dataset_identifier": distribution["dataset_identifier"]
+                }
         setattr(self, "_distributions_index", distributions_index)
 
     def _build_fields_index(self):
@@ -150,7 +151,8 @@ def _build_fields_index(self):
                 fields_index[field["id"]] = {
                     "index": index,
                     "dataset_identifier": field["dataset_identifier"],
-                    "distribution_identifier": field["distribution_identifier"]
+                    "distribution_identifier": field.get(
+                        "distribution_identifier")
                 }
         setattr(self, "_fields_index", fields_index)
 

diff --git a/pydatajson/search.py b/pydatajson/search.py
@@ -122,8 +122,8 @@ def get_fields(catalog, filter_in=None, filter_out=None, meta_field=None,
                     field["dataset_identifier"] = distribution[
                         "dataset_identifier"]
                     # agrega el id de la distribución
-                    field["distribution_identifier"] = distribution[
-                        "identifier"]
+                    field["distribution_identifier"] = distribution.get(
+                        "identifier")
 
                     fields.append(field)
 

diff --git a/setup.py b/setup.py
@@ -18,7 +18,7 @@
 
 setup(
     name='pydatajson',
-    version='0.4.6',
+    version='0.4.7',
     description="Paquete en python con herramientas para generar y validar metadatos de catálogos de datos en formato data.json.",
     long_description=readme + '\n\n' + history,
     author="Datos Argentina",

diff --git a/tests/profiling.py b/tests/profiling.py
@@ -66,7 +66,7 @@ def main():
     #     os.path.join(SAMPLES_DIR, "catalogo_justicia.json"))
 
     # ejemplo grande
-    datasets_cant = 20
+    datasets_cant = 100
     original_catalog = pydatajson.DataJson(
         "http://infra.datos.gob.ar/catalog/sspm/data.json")
     original_catalog["dataset"] = original_catalog["dataset"][:datasets_cant]