From dcc13c113eb2581fb555253854d824076e6e7874 Mon Sep 17 00:00:00 2001
From: bourgesl <bourges.laurent@gmail.com>
Date: Tue, 17 Jul 2018 13:47:21 +0200
Subject: [PATCH] fixed CRYOBSCLIM_CLB template to add missing general funders,
sponsors, PI
---
.gitignore | 1 +
bin/cryobsclim_clp-process.sh | 8 ----
.../access_instruction.html | 0
.../doi_url_data_access.csv | 0
.../inputs/CRYOBSCLIM.CDP.2018.HourlySnow.csv | 34 +++++++++++++++
.../inputs/CRYOBSCLIM.CDP.2018.MetInsitu.csv | 35 ++++++++++++++++
.../inputs/CRYOBSCLIM.CDP.2018.MetSafran.csv | 32 +++++++++++++++
.../CRYOBSCLIM.CDP.2018.MetSnowDaily.csv | 36 ++++++++++++++++
.../CRYOBSCLIM.CDP.2018.SnowProfile.csv | 10 +++++
.../inputs/CRYOBSCLIM.CDP.2018.Soil.csv | 22 ++++++++++
.../inputs/CRYOBSCLIM.CDP.2018.SolarMask.csv | 19 +++++++++
.../metadata/doi_observatory_CDP_2018.csv} | 6 +--
.../names_override.csv | 0
.../project.properties | 0
.../CRYOBSCLIM.CDP.2018_template.csv | 12 ++++++
.../templates/template_all_dataset.csv | 37 ++++++++++++-----
resources/xsl/3.1/doi2csv.xsl | 41 ++++++++++++++++++-
17 files changed, 270 insertions(+), 23 deletions(-)
delete mode 100755 bin/cryobsclim_clp-process.sh
rename conf/{CRYOBSCLIM_CLP => CRYOBSCLIM_CDP}/access_instruction.html (100%)
rename conf/{CRYOBSCLIM_CLP => CRYOBSCLIM_CDP}/doi_url_data_access.csv (100%)
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.HourlySnow.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetInsitu.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSafran.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSnowDaily.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SnowProfile.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.Soil.csv
create mode 100644 conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SolarMask.csv
rename conf/{CRYOBSCLIM_CLP/metadata/doi_observatory_CDP.csv => CRYOBSCLIM_CDP/metadata/doi_observatory_CDP_2018.csv} (89%)
rename conf/{CRYOBSCLIM_CLP => CRYOBSCLIM_CDP}/names_override.csv (100%)
rename conf/{CRYOBSCLIM_CLP => CRYOBSCLIM_CDP}/project.properties (100%)
create mode 100644 conf/CRYOBSCLIM_CDP/templates/CRYOBSCLIM.CDP.2018_template.csv
diff --git a/.gitignore b/.gitignore
index 62025bc..f1849d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*.sh
bin/*-local.sh
bin/application*.yml
bin/osug-doi.log
diff --git a/bin/cryobsclim_clp-process.sh b/bin/cryobsclim_clp-process.sh
deleted file mode 100755
index bb8efb3..0000000
--- a/bin/cryobsclim_clp-process.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-PROJECT=CRYOBSCLIM_CLP
-
-bash doimgr-process.sh $PROJECT
-
-echo "done."
-
diff --git a/conf/CRYOBSCLIM_CLP/access_instruction.html b/conf/CRYOBSCLIM_CDP/access_instruction.html
similarity index 100%
rename from conf/CRYOBSCLIM_CLP/access_instruction.html
rename to conf/CRYOBSCLIM_CDP/access_instruction.html
diff --git a/conf/CRYOBSCLIM_CLP/doi_url_data_access.csv b/conf/CRYOBSCLIM_CDP/doi_url_data_access.csv
similarity index 100%
rename from conf/CRYOBSCLIM_CLP/doi_url_data_access.csv
rename to conf/CRYOBSCLIM_CDP/doi_url_data_access.csv
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.HourlySnow.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.HourlySnow.csv
new file mode 100644
index 0000000..2b79323
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.HourlySnow.csv
@@ -0,0 +1,34 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.HourlySnow;
+title;Col de Porte, Hourly snow data;
+publicationYear;2018;
+subject:main;soil temperature;
+subject:main;runoff;
+subject:main;snow depth;
+subject:main;surface temperature;
+subject:main;settling disk height;
+subject:main;settling disk temperature;
+subject:main;soil moisture;
+subject:main;ground flux;
+contributorName:WorkPackageLeader;Philippe Lapalus;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Jean-Michel Panel;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Erwan Le Gac;affiliation;CNRM/CEN;
+date:Collected;1993-08-01/2017-07-31;
+format;netCDF;
+description:SeriesInformation;"This dataset contains the hourly measured snow and soil properties in netCDF format. The dataset containes the following variables as a function of time (UTC) :
+- Soil_temperature_10cm, 20cm and 50 cm (K)
+- Runoff_5m2 and 1m2 (kg m-2 h-1)
+- Surface temperature (K)
+- Ground_flux_1, 2, 3 (W m-2)
+- Settling_disks_height_1 to 20 (m)
+- Settling_disks_temp_1 to 20 (K)
+- Soil_temperature_5cm_1, 2 and 3 (K)
+- Soil_temperature_10cm_1, 2 and 3 (K)
+- Soil_temperature_20cm_1 and 2 (K)
+- Soil_temperature_30cm_1 and 2 (K)
+- Soil_moisture_5cm_1, 2 and 3 (m3 m-3)
+- Soil_moisture_10cm_1, 2 and 3 (m3 m-3)
+- Soil_moisture_20cm_1 and 2 (m3 m-3)
+- Soil_moisture_30cm_1 and 2 (m3 m-3)
+- Snow_depth (cm)
+A full description of the data and of the sensors location is available in Lejeune et al. (ESSD, 2018) .";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetInsitu.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetInsitu.csv
new file mode 100644
index 0000000..d92eee8
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetInsitu.csv
@@ -0,0 +1,35 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.MetInsitu;
+title;Col de Porte, Hourly meteorological data;
+publicationYear;2018;
+subject:main;Air Temperature;
+subject:main;Specific Humidity;
+subject:main;Wind speed;
+subject:main;Rainfall rate ;
+subject:main;Snowfall rate;
+subject:main;Incident longwave radiation;
+subject:main;Incident shortwave direct radiation;
+subject:main;Incident shortwave diffuse radiation;
+subject:main;Surface pressure ;
+subject:main;Nebulosity;
+contributorName:WorkPackageLeader;Matthieu Lafaysse;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Jean-Michel Panel;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Erwan Le Gac;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Marie Dumont;affiliation;CNRM/CEN;
+date:Collected;1993-08-01/2017-07-31;
+format;netCDF;
+description:SeriesInformation;"This dataset contains the hourly measured meteorological properties in netCDF format. The dataset containes the following variables as a function of time (UTC) :
+- flag (in situ flag, value = 1 for in situ measurement, 0 for SAFRAN reanalysis)
+- ZREF (reference height for temperature measurements, m)
+- UREF (reference height for wind measurements, m)
+- Tair (near surface air temperature, K)
+- Qair (near surface air specific humidity, kg/kg)
+- Wind (wind speed, m s-1)
+- Rainf (rainfall rate, kg m-2 s-1)
+- Snowf (snowfall rate, kg m-2 s-1)
+- LWdown (surface incident longwave radiation, W m-2)
+- SCA_SWdown ( surface incident diffuse shortwave radiation, W m-2)
+- DIR_SWdown ( surface incident direct shortwave radiation, W m-2)
+- Psurf ( surface pressure, Pa climatological value)
+- NEB (nebulosity between 0 and 1, no unit)
+A full description of the data and of the sensors location is available in Lejeune et al. (ESSD, 2018) .";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSafran.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSafran.csv
new file mode 100644
index 0000000..e0f6b9a
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSafran.csv
@@ -0,0 +1,32 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.MetSafran;
+title;Col de Porte, Hourly meteorological data from SAFRAN reanalysis;
+publicationYear;2018;
+subject:main;Air Temperature;
+subject:main;Specific Humidity;
+subject:main;Wind speed;
+subject:main;Rainfall rate ;
+subject:main;Snowfall rate;
+subject:main;Incident longwave radiation;
+subject:main;Incident shortwave direct radiation;
+subject:main;Incident shortwave diffuse radiation;
+subject:main;Surface pressure ;
+subject:main;Nebulosity;
+contributorName:WorkPackageLeader;Matthieu Lafaysse;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Marie Dumont;affiliation;CNRM/CEN;
+date:Collected;1960-08-01/2017-08-01;
+format;netCDF;
+description:SeriesInformation;"This dataset contains the hourly analysis of meteorological properties in netCDF format performed by the SAFRAN reanalysis system (Durand et al., 2009). The dataset containes the following variables as a function of time (UTC) :
+- ZREF (reference height for temperature measurements, m)
+- UREF (reference height for wind measurements, m)
+- Tair (near surface air temperature, K)
+- Qair (near surface air specific humidity, kg/kg)
+- Wind (wind speed, m s-1)
+- Rainf (rainfall rate, kg m-2 s-1)
+- Snowf (snowfall rate, kg m-2 s-1)
+- LWdown (surface incident longwave radiation, W m-2)
+- SCA_SWdown ( surface incident diffuse shortwave radiation, W m-2)
+- DIR_SWdown ( surface incident direct shortwave radiation, W m-2)
+- Psurf ( surface pressure, Pa climatological value)
+- NEB (nebulosity between 0 and 1, no unit)
+A full description of the data is available in Lejeune et al. (ESSD, 2018) .";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSnowDaily.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSnowDaily.csv
new file mode 100644
index 0000000..fdf707d
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.MetSnowDaily.csv
@@ -0,0 +1,36 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.MetSnowDaily;
+title;Col de Porte, Daily snow and meteorological data;
+publicationYear;2018;
+subject:main;Snow depth ;
+subject:main;Snow water equivalent;
+subject:main;Air Temperature;
+subject:main;Total precipitation ;
+subject:main;Snowfall ;
+subject:main;Rainfall ;
+subject:main;Albedo;
+subject:main;Height of new snow;
+contributorName:WorkPackageLeader;Philippe Lapalus;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Jean-Michel Panel;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Erwan Le Gac;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Marie Dumont;affiliation;CNRM/CEN;
+date:Collected;1960-08-01/2017-07-31;
+format;netCDF;
+description:SeriesInformation;"This dataset contains the daily measured meteorological and snow properties in netCDF format. The dataset containes the following variables as a function of time (UTC) :
+- snow_depth_auto (m)
+- snow_depth_pit (m)
+- snow_depth_pit_south (m)
+- snow_depth_pit_north (m)
+- swe_auto (kg m-2)
+- swe_pit (kg m-2)
+- swe_pit_south (kg m-2)
+- swe_pit_north (kg m-2)
+- Tmin (K, minimum air temperature)
+- Tmax (K, maximum air temperature)
+- total_precipitation (kg m-2)
+- rain (kg m-2)
+- snow (kg m-2)
+- albedo_daily (no unit)
+- albedo_daily_flag (no unit)
+- height_of_new_snow (cm)
+A full description of the data and of the sensors location is available in Lejeune et al. (ESSD, 2018) .";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SnowProfile.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SnowProfile.csv
new file mode 100644
index 0000000..87dc017
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SnowProfile.csv
@@ -0,0 +1,10 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.SnowProfile;
+title;Col de Porte, Snow Profile;
+publicationYear;2018;
+subject:main;snow profile;
+contributorName:WorkPackageLeader;Philippe Lapalus;affiliation;CNRM/CEN;
+date:Collected;1993-09-01 to 2015-06-01;
+format;caaml;
+description:SeriesInformation;"This dataset contains the measured snow properties in caaml format complying to caaml v5. format (http://caaml.org/Schemas/V5.0/Profiles/SnowProfileIACS/). A vizualization of the files can be performed using the niViz software (https://niviz.org/). Each file name is labelled as colDePorte_YYYYMMDDHHMM.caaml .
+A full description of the data is available in Lejeune et al. (ESSD, 2018).";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.Soil.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.Soil.csv
new file mode 100644
index 0000000..affc86c
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.Soil.csv
@@ -0,0 +1,22 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.Soil;
+title;Col de Porte, Soil properties;
+publicationYear;2008;
+subject:main;Soil properties;
+contributorName:WorkPackageLeader;Marcel Sudul;affiliation;CNRM/CEN;
+contributorName:WorkPackageLeader;Jean-Marie Willemet;affiliation;CNRM/CEN;
+date:Collected;2008-09-29;
+format;CSV;
+description:SeriesInformation;"This dataset contains the soil properties and particles size measured at location 33 on 29 September 2008.
+Data are available in a csv format (separator «,») and are organized in 10 columns :
+C1Â : top depth of the soil sample (cm)
+C2Â : bottom depth of the soil sample (cm)
+C3Â : Carbon content of soil (g/kg)
+C4 : Total Nitrogen content of soil (g/kg)
+C5Â : Organic matter content of soil (g/kg)
+C6Â : Coarse sand content of soil, particles size from 200 to 2000 microns (g/kg)
+C7Â : Fine sand content of soil, particles size from 50 to 200 microns (g/kg)
+C8Â : Coarse silt content of soil, particles size from 20 to 50 microns (g/kg)
+C9Â : Fine silt content of soil, particles size from 2 to 20 microns (g/kg)
+C10 : Clay, particles size smaller than 2 microns (g/kg)
+A full description of the data is available in Lejeune et al. (ESSD, 2018).";
diff --git a/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SolarMask.csv b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SolarMask.csv
new file mode 100644
index 0000000..2211a4d
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/inputs/CRYOBSCLIM.CDP.2018.SolarMask.csv
@@ -0,0 +1,19 @@
+# Generated by doi2csv.xsl;;
+identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018.SolarMask;
+title;Col de Porte, Solar Mask;
+publicationYear;1998;
+subject:main;Solar Mask;
+contributorName:WorkPackageLeader;Pierre Spandre;affiliation;CNRM/CEN;
+date:Collected;1998-07-01/2018-06-20;
+format;CSV;
+description:SeriesInformation;"This dataset contains solar mask measured at location 31 close to the radiations measurements sensors in July 1998 and June 2018.
+Data are available in a csv format (separator « ») and are organized in 8 lines:
+L1Â : Azimuth for July 1998 in degrees from North
+L2Â : Upper elevation of the mask in degrees for July 1998
+L3Â : Lower elevation of the mask in degrees for July 1998
+L4Â : Percentage of occultation between the lower and upper elevation for July 1998
+L5Â : Azimuth for June 2018 in degrees from North
+L6Â : Upper elevation of the mask in degrees for June 2018
+L7Â : Lower elevation of the mask in degrees for June 2018
+L8Â : Percentage of occultation between the lower and upper elevation for June 2018
+A full description of the data is available in Lejeune et al. (ESSD, 2018).";
diff --git a/conf/CRYOBSCLIM_CLP/metadata/doi_observatory_CDP.csv b/conf/CRYOBSCLIM_CDP/metadata/doi_observatory_CDP_2018.csv
similarity index 89%
rename from conf/CRYOBSCLIM_CLP/metadata/doi_observatory_CDP.csv
rename to conf/CRYOBSCLIM_CDP/metadata/doi_observatory_CDP_2018.csv
index f7cd245..8050e3f 100644
--- a/conf/CRYOBSCLIM_CLP/metadata/doi_observatory_CDP.csv
+++ b/conf/CRYOBSCLIM_CDP/metadata/doi_observatory_CDP_2018.csv
@@ -1,4 +1,4 @@
-# Clé;Valeur;;;;
+"# Clé";Valeur;;;;
identifier:DOI;10.5072/CRYOBSCLIM.CDP.2018;;;;
creatorName;Cryobs-Clim-CDP;;;;
title;"Cryobs-Clim-CDP / Col de Porte : a meterological and snow observatory ";;;;
@@ -39,12 +39,12 @@ contributorName:DataCollector;"Samuel Morin ";affiliation;CNRM/CEN;nameIdentifie
date:Collected;2018-12-01/;;;;
language;en;;;;
resourceType:Dataset;"Meteorological and snow observations site ";;;;
-relatedIdentifier:Cites:URL;https://cryobsclim.osug.fr/?lang=en;;;;
+relatedIdentifier:Cites:URL;https://www.umr-cnrm.fr/spip.php?rubrique218&lang=en;;;;
format;CSV;;;;
rights;"Data access and use are ruled by the CRYOBS-CLIM data policy.";;;;
rights;"Always quote below citation to Lejeune et al. (2018) when using data.
Lejeune, Y., Dumont, M., Panel J.-M., Lafaysse, M., Lapalus, P., Le Gac, E., Lesaffre, B. and Morin, S., 57 years (1960-2017) of snow and meteorological observations from a mid-altitude mountain site (Col de Porte, France, 1325 m alt.), Earth System Science Data, X(X), X-X, doi:X/essd-X. The following acknowledging sentence should appear in publications using Cryobs-Clim-CDP data and products: ""Cryobs-Clim Col de Porte is funded by Meteo France,, the Institut National des Sciences de l’Univers (INSU/CNRS), and the Observatoire des Sciences de l’Univers de Grenoble (OSUG / Université Grenoble Alpes)â€. You are invited to contact the PI(s) or lead scientist for more information about the data and to include the acknowledgement sentence in any publication using the data.";;;;
-description:Abstract;"The Col de Porte observatory is located near Grenoble in Chartreuse massif and is dedicated to study interactions between the cryosphere and the atmosphere at medium altitude. The site is managed by Météo-France (CNRM/CEN).The experimental site and related instrumentation are described in details in Morin et al., 2012 and Lejeune et al. (2018). Hourly meteorological data from in situ measurements (CRYOBSCLIM.CDP.MetInsitu) and from meteorological reanalysis (CRYOBSCLIM.CDP.MetSafran) are provided along with measured snow properties (CRYOBSCLIM.CDP.HourlySnow) and snow profiles (CRYOBSCLIM.CDP.SnowProfile) and measured solar radiation masks (CRYOBSCLIM.CDP.SolarMask). The daily snow and meteorological dataset covers the 1960-2017 period (CRYOBSCLIM.CDP.MetSnowDaily).
+description:Abstract;"The Col de Porte observatory is located near Grenoble in Chartreuse massif and is dedicated to study interactions between the cryosphere and the atmosphere at medium altitude. The site is managed by Météo-France (CNRM/CEN).The experimental site and related instrumentation are described in details in Morin et al., 2012 and Lejeune et al. (2018). Hourly meteorological data from in situ measurements (CRYOBSCLIM.CDP.2018.MetInsitu) and from meteorological reanalysis (CRYOBSCLIM.CDP.2018.MetSafran) are provided along with measured snow properties (CRYOBSCLIM.CDP.2018.HourlySnow) and snow profiles (CRYOBSCLIM.CDP.2018.SnowProfile) and measured solar radiation masks (CRYOBSCLIM.CDP.2018.SolarMask) and soil properties (CRYOBSCLIM.CDP.2018.Soil). The daily snow and meteorological dataset covers the 1960-2017 period (CRYOBSCLIM.CDP.2018.MetSnowDaily).
Snowpack models and atmospheric models have been evaluated at this site. Finally, Col de Porte is a target site to evaluate Numerical Weather Prediction (NWP) models in alpine terrain.
Cryobs-Clim-CDP is a Cryonet site of Global Cryosphere Watch (WMO), a member of the International Network for Alpine Research Catchment Hydrology (INARCH) and a part of OZCAR Infrastructure.";;;;
geoLocationPlace;"Col de Porte Observatory";;;;
diff --git a/conf/CRYOBSCLIM_CLP/names_override.csv b/conf/CRYOBSCLIM_CDP/names_override.csv
similarity index 100%
rename from conf/CRYOBSCLIM_CLP/names_override.csv
rename to conf/CRYOBSCLIM_CDP/names_override.csv
diff --git a/conf/CRYOBSCLIM_CLP/project.properties b/conf/CRYOBSCLIM_CDP/project.properties
similarity index 100%
rename from conf/CRYOBSCLIM_CLP/project.properties
rename to conf/CRYOBSCLIM_CDP/project.properties
diff --git a/conf/CRYOBSCLIM_CDP/templates/CRYOBSCLIM.CDP.2018_template.csv b/conf/CRYOBSCLIM_CDP/templates/CRYOBSCLIM.CDP.2018_template.csv
new file mode 100644
index 0000000..b922624
--- /dev/null
+++ b/conf/CRYOBSCLIM_CDP/templates/CRYOBSCLIM.CDP.2018_template.csv
@@ -0,0 +1,12 @@
+creatorName;Cryobs-Clim-CDP;
+publisher;CNRS - OSUG - Meteo France;
+contributorName:DataManager;Yves Lejeune;affiliation;CNRM/CEN;
+language;en;
+relatedIdentifier:Cites:URL;https://www.umr-cnrm.fr/spip.php?rubrique218&lang=en;
+relatedIdentifier:IsPartOf:DOI;10.5072/CRYOBSCLIM.CDP.2018;
+rights;Data access and use are ruled by the CRYOBS-CLIM data policy.;
+rights;"Always quote below citation to Lejeune et al. (2018) when using data.
+ Lejeune, Y., Dumont, M., Panel J.-M., Lafaysse, M., Lapalus, P., Le Gac, E., Lesaffre, B. and Morin, S., 57 years (1960-2017) of snow and meteorological observations from a mid-altitude mountain site (Col de Porte, France, 1325 m alt.), Earth System Science Data, X(X), X-X, doi:X/essd-X. The following acknowledging sentence should appear in publications using Cryobs-Clim-CDP data and products: ""Cryobs-Clim Col de Porte is funded by Meteo France,, the Institut National des Sciences de l’Univers (INSU/CNRS), and the Observatoire des Sciences de l’Univers de Grenoble (OSUG / Université Grenoble Alpes)â€. You are invited to contact the PI(s) or lead scientist for more information about the data and to include the acknowledgement sentence in any publication using the data.";
+description:Abstract;"This dataset is part of the Cryobs-Clim-CDP (CRYosphere, an OBServatory of the CLIMate – Col de Porte) observatory";
+geoLocationPlace;Col de Porte;
+geoLocationPoint;45.30 5.77;
diff --git a/conf/CRYOBSCLIM_CLB/templates/template_all_dataset.csv b/conf/CRYOBSCLIM_CLB/templates/template_all_dataset.csv
index 8fc6b97..559e3e3 100644
--- a/conf/CRYOBSCLIM_CLB/templates/template_all_dataset.csv
+++ b/conf/CRYOBSCLIM_CLB/templates/template_all_dataset.csv
@@ -1,11 +1,28 @@
-"# Clé";Valeur
-creatorName;Cryobs-Clim-CLB
-publisher;"CNRS - OSUG - Meteo France - Irstea"
-description:Abstract;"This dataset is part of the Cryobs-Clim-CLB (CRYosphere, an OBServatory of the CLIMate – Col du Lac Blanc) observatory"
-language;en
-relatedIdentifier:Cites:URL;https://cryobsclim.osug.fr/?lang=en
-relatedIdentifier:IsPartOf:DOI;10.5072/CRYOBSCLIM.CLB.all
-format;CSV
-rights;"Data access and use are ruled by the CRYOBS-CLIM data policy."
+"# Clé";Valeur;;;;
+creatorName;Cryobs-Clim-CLB;;;;
+publisher;"CNRS - OSUG - Meteo France - Irstea";;;;
+description:Abstract;"This dataset is part of the Cryobs-Clim-CLB (CRYosphere, an OBServatory of the CLIMate – Col du Lac Blanc) observatory";;;;
+contributorName:ContactPerson;florence.naaim@irstea.fr;affiliation;UGA/Irstea;nameIdentifier:ORCID;0000-0002-7175-5270
+contributorName:Distributor;"Centre d'Etude de la Neige (Meteo France / CNRM)";;;;
+contributorName:Distributor;"UR ETNA (Irstea)";;;;
+contributorName:Distributor;"OSUG Data Center (France)";;;;
+contributorName:HostingInstitution;"Université Grenoble Alpes (France) - UGA";;;;
+contributorName:Funder;"Meteo France";;;;
+contributorName:Funder;"IRSTEA (Institut national de Recherche en Sciences et Technologies pour l'environnement et l'agriculture)";;;;
+contributorName:Funder;"Centre National de la Recherche Scientifique (France) - CNRS, Institut de Sciences de l'Univers (France) - INSU";;;;
+contributorName:Funder;"Observatoire des Sciences de l'Univers de Grenoble (France) - OSUG";;;;
+contributorName:ProjectLeader;"Florence Naaim";affiliation;UGA/Irstea;nameIdentifier:ORCID;0000-0002-7175-5270
+contributorName:Sponsor;"Cryobs-Clim / Alliance nationale de recherche pour l’environnement (AllEnvi)";;;;
+contributorName:Sponsor;"Région Rhône-Alpes";;;;
+contributorName:Sponsor;"Infrastructure de Recherche Observation de la Zone Critique, Applications, Recherche (OZCAR) / Ministère de l'Éducation nationale, de l'Enseignement supérieur et de la Recherche";;;;
+contributorName:Sponsor;"LabEx OSUG@2020";;;;
+contributorName:Sponsor;"ALCOTRA INTERREG MAP3 program (FEDER)";;;;
+contributorName:ResearchGroup;"Centre National de la Recherche en Météorologie (France) - CNRM - France";;;;
+contributorName:ResearchGroup;"Institut national de recherche en sciences et technologies pour l'environnement et l'agriculture - IRSTEA - France";;;;
+contributorName:ResearchGroup;"Graduate School of Environmental Studies - Nagoya University - Nagoya - Japan";;;;
+relatedIdentifier:Cites:URL;https://cryobsclim.osug.fr/?lang=en;;;;
+relatedIdentifier:IsPartOf:DOI;10.5072/CRYOBSCLIM.CLB.all;;;;
+format;CSV;;;;
+rights;"Data access and use are ruled by the CRYOBS-CLIM data policy.";;;;
rights;"Always quote below citation to Guyomarch et al. (xx) when using data.
-G. Guyomarc'h, H. bellot, V. Vionnet, F. Naaim-Bouvet, Y. Deliot, F. Fontaine, P. Pugliese, M. Naaim, K. Nishimura, A meteorological and blowing snow data set (2000-2016) from a high altitude alpine site (Col du Lac Blanc, France, 2720 m a.s.l), Earth System Science Data, X(X), X-X, doi:X/essd-X. The following acknowledging sentence should appear in publications using Cryobs-Clim-CLB data and products: ""Cryobs-Clim Col du Lac Blanc is funded by Meteo France, Irstea, the Institut National des Sciences de l’Univers (INSU/CNRS), and the Observatoire des Sciences de l’Univers de Grenoble (OSUG / Université Grenoble Alpes)â€. You are invited to contact the PI(s) or lead scientist for more information about the data and to include the acknowledgement sentence in any publication using the data."
+G. Guyomarc'h, H. bellot, V. Vionnet, F. Naaim-Bouvet, Y. Deliot, F. Fontaine, P. Pugliese, M. Naaim, K. Nishimura, A meteorological and blowing snow data set (2000-2016) from a high altitude alpine site (Col du Lac Blanc, France, 2720 m a.s.l), Earth System Science Data, X(X), X-X, doi:X/essd-X. The following acknowledging sentence should appear in publications using Cryobs-Clim-CLB data and products: ""Cryobs-Clim Col du Lac Blanc is funded by Meteo France, Irstea, the Institut National des Sciences de l’Univers (INSU/CNRS), and the Observatoire des Sciences de l’Univers de Grenoble (OSUG / Université Grenoble Alpes)â€. You are invited to contact the PI(s) or lead scientist for more information about the data and to include the acknowledgement sentence in any publication using the data.";;;;
diff --git a/resources/xsl/3.1/doi2csv.xsl b/resources/xsl/3.1/doi2csv.xsl
index 00bdbea..38832d9 100644
--- a/resources/xsl/3.1/doi2csv.xsl
+++ b/resources/xsl/3.1/doi2csv.xsl
@@ -33,9 +33,11 @@
<!-- 2. Creator(s) -->
<xsl:template match="d:creators/d:creator">
- <xsl:call-template name="row">
+ <xsl:call-template name="rowName">
<xsl:with-param name="key">creatorName</xsl:with-param>
<xsl:with-param name="value" select="d:creatorName/text()"/>
+ <xsl:with-param name="affiliation" select="d:affiliation/text()"/>
+ <xsl:with-param name="orcid" select="d:nameIdentifier[@nameIdentifierScheme = 'ORCID']/text()"/>
</xsl:call-template>
</xsl:template>
@@ -80,10 +82,12 @@
<!-- 7. Contributor(s) -->
<xsl:template match="d:contributors/d:contributor">
- <xsl:call-template name="row">
+ <xsl:call-template name="rowName">
<xsl:with-param name="key">contributorName</xsl:with-param>
<xsl:with-param name="attr" select="@contributorType"/>
<xsl:with-param name="value" select="d:contributorName/text()"/>
+ <xsl:with-param name="affiliation" select="d:affiliation/text()"/>
+ <xsl:with-param name="orcid" select="d:nameIdentifier[@nameIdentifierScheme = 'ORCID']/text()"/>
</xsl:call-template>
</xsl:template>
@@ -237,6 +241,38 @@
<xsl:text> </xsl:text>
</xsl:template>
+ <xsl:template name="rowName">
+ <xsl:param name="key"/>
+ <xsl:param name="attr" select="''"/>
+ <xsl:param name="attr2" select="''"/>
+ <xsl:param name="value" select="''"/>
+ <xsl:param name="affiliation" select="''"/>
+ <xsl:param name="orcid" select="''"/>
+
+ <xsl:call-template name="pair">
+ <xsl:with-param name="key" select="$key"/>
+ <xsl:with-param name="attr" select="$attr"/>
+ <xsl:with-param name="attr2" select="$attr2"/>
+ <xsl:with-param name="value" select="$value"/>
+ </xsl:call-template>
+
+ <xsl:if test="string-length($affiliation) != 0">
+ <xsl:call-template name="pair">
+ <xsl:with-param name="key" select="'affiliation'"/>
+ <xsl:with-param name="value" select="$affiliation"/>
+ </xsl:call-template>
+ </xsl:if>
+
+ <xsl:if test="string-length($orcid) != 0">
+ <xsl:call-template name="pair">
+ <xsl:with-param name="key" select="'nameIdentifier:ORCID'"/>
+ <xsl:with-param name="value" select="$orcid"/>
+ </xsl:call-template>
+ </xsl:if>
+
+ <xsl:text> </xsl:text>
+ </xsl:template>
+
<xsl:template name="pair">
<xsl:param name="key"/>
<xsl:param name="attr" select="''"/>
@@ -270,6 +306,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:if>
+ <xsl:text>;</xsl:text>
</xsl:template>
--
GitLab