diff --git a/_data/facilities.yml b/_data/facilities.yml index 9196bc25b6a786e6f71e7e9ce83bec6a6d37f1fa..35f9e7a2a4d0ca6faa1004f268b871f538a07978 100644 --- a/_data/facilities.yml +++ b/_data/facilities.yml @@ -31,7 +31,7 @@ status: Active adminAddress: - mis@cells.es - datasets: + items: count: 20 sets: count: 2 @@ -107,7 +107,7 @@ link: https://data.ceric-eric.eu/oaipmh/request last-check: 2024-12-22 status: Active - datasets: + items: count: 7 sets: count: 1 @@ -152,7 +152,7 @@ status: Active adminAddress: - datapolicy@esrf.fr - datasets: + items: count: 7202 pan-search-api: link: https://icatplus.esrf.fr/api @@ -179,7 +179,7 @@ link: https://oai.panosc.ess.eu/openaire/oai last-check: 2024-12-22 status: Active - datasets: + items: count: 0 adminAddress: - max.novelli@ess.eu @@ -216,7 +216,7 @@ adminAddress: - luis.maia@xfel.eu - krzysztof.wrona@xfel.eu - datasets: + items: count: 5 sets: count: 1 @@ -257,7 +257,7 @@ status: Active adminAddress: - icatmaster@helmholtz-berlin.de - datasets: + items: count: 28952 sets: count: 3 @@ -299,7 +299,7 @@ last-check: 2024-12-22 adminAddress: - rodare-admin@hzdr.de - datasets: + items: count: 1020 sets: count: 39 @@ -453,7 +453,7 @@ last-check: 2024-12-22 adminAddress: - data@ill.fr - datasets: + items: count: 0 pan-search-api: link: https://fairdata.ill.fr/fairdata/api @@ -541,7 +541,7 @@ last-check: 2024-12-22 adminAddress: - carlo.minotti@psi.ch - datasets: + items: count: 0 pan-search-api: link: https://dacat.psi.ch/panosc-api/ diff --git a/open-data-resources.html b/open-data-resources.html index 87c6a0fc7d29e1238ebb10070b0db8b6d5df4fda..ecab085f085719b94fe7ce2d55baad8f0a4a3c3b 100644 --- a/open-data-resources.html +++ b/open-data-resources.html @@ -58,18 +58,18 @@ title: Open data resources <div class="tooltip-cont"> <div class="trigger-tooltip">Endpoint: <a href="{{facility.odr.oai-pmh-endpoint.link}}">link</a> [<a href="{{facility.odr.oai-pmh-endpoint.link}}?verb=Identify">Identify</a>]<br/>{% - if facility.odr.oai-pmh-endpoint.datasets - %}Datasets: <b>{{facility.odr.oai-pmh-endpoint.datasets.count | thousands_separated}}</b>{% + if facility.odr.oai-pmh-endpoint.items + %}Datasets: <b>{{facility.odr.oai-pmh-endpoint.items.count | thousands_separated}}</b>{% assign total_oai_pmh_dataset_count = total_oai_pmh_dataset_count | plus: facility.odr.pan-search-api.dataset_count %}{% - if facility.odr.oai-pmh-endpoint.datasets.sets%} + if facility.odr.oai-pmh-endpoint.items.sets%} <br/> - <span class="caret">Categories: {{facility.odr.oai-pmh-endpoint.datasets.sets.count | thousands_separated}}</span> + <span class="caret">Categories: {{facility.odr.oai-pmh-endpoint.items.sets.count | thousands_separated}}</span> <div class="toggled"> <table> <tr> <th>Category</th><th>Datasets</th> </tr> - {% for set in facility.odr.oai-pmh-endpoint.datasets.sets.details %} + {% for set in facility.odr.oai-pmh-endpoint.items.sets.details %} <tr> <td>{{set[1].name}}</td><td>{{set[1].count | thousands_separated}}</td> </tr> diff --git a/scripts/update_oai-pmh.rb b/scripts/update_oai-pmh.rb index 9da1dca76a16df945678de20a453ee4e0e41c78c..1e91caa5aedfec420f43c007e69e1f8840377143 100644 --- a/scripts/update_oai-pmh.rb +++ b/scripts/update_oai-pmh.rb @@ -393,16 +393,16 @@ facilities.each do |facility| oai_pmh['adminAddress'] = adminAddress end - oai_pmh.delete('datasets') + oai_pmh.delete('items') if status == "Active" - datasets = {} - oai_pmh['datasets'] = datasets - datasets['count'] = total_count + items = {} + oai_pmh['items'] = items + items['count'] = total_count if !set_count.empty? sets = {} - datasets['sets'] = sets + items['sets'] = sets sets['count'] = set_count.length()