Merge pull request #274 from CSCfi/CSCMETAX-406-fix-data-catalogs-also

CSCMETAX-406: [ADD] Update data catalog and production catalog schema…
CSCfi · Jun 5, 2018 · 48b06a4 · 48b06a4
2 parents ede68ca + f75dc24
commit 48b06a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/src/metax_api/initialdata/datacatalogs.json b/src/metax_api/initialdata/datacatalogs.json
@@ -54,12 +54,10 @@
                     }
                 }
             ],
-            "description": [
-                {
-                    "en": "Datasets stored in the IDA service",
-                    "fi": "IDA-palvelussa säilytettävät aineistot"
-                }
-            ]
+            "description": {
+                "en": "Datasets stored in the IDA service",
+                "fi": "IDA-palvelussa säilytettävät aineistot"
+            }
         },
         "dataset_versioning": true,
         "research_dataset_schema": "ida"
@@ -121,12 +119,10 @@
                     }
                 }
             ],
-            "description": [
-                {
-                    "en": "Contains datasets that are not stored in the Finnish Fairdata services.",
-                    "fi": "Sisältää esimerkiksi verkkoaineistot, rajapinnat ja muut muualla kuin fairdata-palveluissa säilytettävät aineistot."
-                }
-            ]
+            "description": {
+                "en": "Contains datasets that are not stored in the Finnish Fairdata services.",
+                "fi": "Sisältää esimerkiksi verkkoaineistot, rajapinnat ja muut muualla kuin fairdata-palveluissa säilytettävät aineistot."
+            }
         },
         "dataset_versioning": false,
         "research_dataset_schema": "att"

diff --git a/src/metax_api/management/commands/loadinitialdata.py b/src/metax_api/management/commands/loadinitialdata.py
@@ -113,7 +113,7 @@ def _load_data_catalogs(self):
                         continue
 
                 # create or update ended in error
-                self.stdout.write('Failed to process catalog: %s. Reason: %s' %
+                raise CommandError('Failed to process catalog: %s. Reason: %s' %
                     (dc['catalog_json']['identifier'], errors))
 
     def _load_file_storages(self):
@@ -152,5 +152,5 @@ def _load_file_storages(self):
                         continue
 
                 # create or update ended in error
-                self.stdout.write('Failed to process storage: %s. Reason: %s' %
+                raise CommandError('Failed to process storage: %s. Reason: %s' %
                     (fs['file_storage_json']['identifier'], errors))