diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ExternalReference.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ExternalReference.java deleted file mode 100644 index 9c954a420..000000000 --- a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/dump/oaf/ExternalReference.java +++ /dev/null @@ -1,61 +0,0 @@ - -package eu.dnetlib.dhp.schema.dump.oaf; - -import java.io.Serializable; -import java.util.Objects; - -import eu.dnetlib.dhp.schema.oaf.ExtraInfo; - -//ExtraInfo renamed ExternalReference do not confuse with ExternalReference in oaf schema -public class ExternalReference implements Serializable { - private String name; - - private String typology; - - private Provenance provenance; - - // json containing a Citation or Statistics - private String value; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getTypology() { - return typology; - } - - public void setTypology(String typology) { - this.typology = typology; - } - - public Provenance getProvenance() { - return provenance; - } - - public void setProvenance(Provenance provenance) { - this.provenance = provenance; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public static ExternalReference newInstance(ExtraInfo ei) { - ExternalReference er = new ExternalReference(); - - er.name = ei.getName(); - er.typology = ei.getTypology(); - er.provenance = Provenance.newInstance(ei.getProvenance(), ei.getTrust()); - er.value = ei.getValue(); - return er; - } -} diff --git a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration.xml b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration.xml index 220a5c8be..eac320d09 100644 --- a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration.xml +++ b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration.xml @@ -17,23 +17,23 @@ - SDG13 - Climate action - SDG8 - Decent work and economic growth - SDG15 - Life on land - SDG2 - Zero hunger - SDG17 - Partnerships for the goals - SDG10 - Reduced inequalities - SDG5 - Gender equality - SDG12 - Responsible consumption and production - SDG14 - Life below water - SDG6 - Clean water and sanitation - SDG11 - Sustainable cities and communities - SDG1 - No poverty - SDG3 - Good health and well being - SDG7 - Affordable and clean energy - SDG4 - Quality education - SDG9 - Industry innovation and infrastructure - SDG16 - Peace justice and strong institutions + SDG13 - Climate action + SDG8 - Decent work and economic growth + SDG15 - Life on land + SDG2 - Zero hunger + SDG17 - Partnerships for the goals + SDG10 - Reduced inequalities + SDG5 - Gender equality + SDG12 - Responsible consumption and production + SDG14 - Life below water + SDG6 - Clean water and sanitation + SDG11 - Sustainable cities and communities + SDG1 - No poverty + SDG3 - Good health and well being + SDG7 - Affordable and clean energy + SDG4 - Quality education + SDG9 - Industry innovation and infrastructure + SDG16 - Peace justice and strong institutions @@ -55,24 +55,24 @@ - brain mapping - brain imaging - electroencephalography - arterial spin labelling - brain fingerprinting - brain - neuroimaging - Multimodal Brain Image Analysis - fMRI - neuroinformatics - fetal brain - brain ultrasonic imaging - topographic brain mapping - diffusion tensor imaging - computerized knowledge assessment - connectome mapping - brain magnetic resonance imaging - brain abnormalities + brain mapping + brain imaging + electroencephalography + arterial spin labelling + brain fingerprinting + brain + neuroimaging + Multimodal Brain Image Analysis + fMRI + neuroinformatics + fetal brain + brain ultrasonic imaging + topographic brain mapping + diffusion tensor imaging + computerized knowledge assessment + connectome mapping + brain magnetic resonance imaging + brain abnormalities @@ -100,39 +100,33 @@ - marine - ocean - fish - aqua - sea + marine + ocean + fish + aqua + sea - - - re3data_____::9633d1e8c4309c833c2c442abeb0cfeb - - - - animal production and health - fisheries and aquaculture - food safety and human nutrition - information management - food technology - agri-food education and extension - natural resources and environment - food system - engineering technology and Research - agriculture - food safety risk assessment - food security - farming practices and systems - plant production and protection - agri-food economics and policy - food distribution - forestry + animal production and health + fisheries and aquaculture + food safety and human nutrition + information management + food technology + agri-food education and extension + natural resources and environment + food system + engineering technology and Research + agriculture + food safety risk assessment + food security + farming practices and systems + plant production and protection + agri-food economics and policy + food distribution + forestry diff --git a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml index aa7827884..cd5ea38d0 100644 --- a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml +++ b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/community_configuration_selcrit.xml @@ -17,23 +17,23 @@ - SDG13 - Climate action - SDG8 - Decent work and economic growth - SDG15 - Life on land - SDG2 - Zero hunger - SDG17 - Partnerships for the goals - SDG10 - Reduced inequalities - SDG5 - Gender equality - SDG12 - Responsible consumption and production - SDG14 - Life below water - SDG6 - Clean water and sanitation - SDG11 - Sustainable cities and communities - SDG1 - No poverty - SDG3 - Good health and well being - SDG7 - Affordable and clean energy - SDG4 - Quality education - SDG9 - Industry innovation and infrastructure - SDG16 - Peace justice and strong institutions + SDG13 - Climate action + SDG8 - Decent work and economic growth + SDG15 - Life on land + SDG2 - Zero hunger + SDG17 - Partnerships for the goals + SDG10 - Reduced inequalities + SDG5 - Gender equality + SDG12 - Responsible consumption and production + SDG14 - Life below water + SDG6 - Clean water and sanitation + SDG11 - Sustainable cities and communities + SDG1 - No poverty + SDG3 - Good health and well being + SDG7 - Affordable and clean energy + SDG4 - Quality education + SDG9 - Industry innovation and infrastructure + SDG16 - Peace justice and strong institutions @@ -55,24 +55,24 @@ - brain mapping - brain imaging - electroencephalography - arterial spin labelling - brain fingerprinting - brain - neuroimaging - Multimodal Brain Image Analysis - fMRI - neuroinformatics - fetal brain - brain ultrasonic imaging - topographic brain mapping - diffusion tensor imaging - computerized knowledge assessment - connectome mapping - brain magnetic resonance imaging - brain abnormalities + brain mapping + brain imaging + electroencephalography + arterial spin labelling + brain fingerprinting + brain + neuroimaging + Multimodal Brain Image Analysis + fMRI + neuroinformatics + fetal brain + brain ultrasonic imaging + topographic brain mapping + diffusion tensor imaging + computerized knowledge assessment + connectome mapping + brain magnetic resonance imaging + brain abnormalities @@ -100,11 +100,11 @@ - marine - ocean - fish - aqua - sea + marine + ocean + fish + aqua + sea @@ -116,23 +116,23 @@ - animal production and health - fisheries and aquaculture - food safety and human nutrition - information management - food technology - agri-food education and extension - natural resources and environment - food system - engineering technology and Research - agriculture - food safety risk assessment - food security - farming practices and systems - plant production and protection - agri-food economics and policy - food distribution - forestry + animal production and health + fisheries and aquaculture + food safety and human nutrition + information management + food technology + agri-food education and extension + natural resources and environment + food system + engineering technology and Research + agriculture + food safety risk assessment + food security + farming practices and systems + plant production and protection + agri-food economics and policy + food distribution + forestry diff --git a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/tagging_conf.xml b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/tagging_conf.xml index 3070ff075..d4c83438b 100644 --- a/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/tagging_conf.xml +++ b/dhp-workflows/dhp-enrichment/src/test/resources/eu/dnetlib/dhp/bulktag/communityconfiguration/tagging_conf.xml @@ -46,23 +46,23 @@ - SDG13 - Climate action - SDG8 - Decent work and economic growth - SDG15 - Life on land - SDG2 - Zero hunger - SDG17 - Partnerships for the goals - SDG10 - Reduced inequalities - SDG5 - Gender equality - SDG12 - Responsible consumption and production - SDG14 - Life below water - SDG6 - Clean water and sanitation - SDG11 - Sustainable cities and communities - SDG1 - No poverty - SDG3 - Good health and well being - SDG7 - Affordable and clean energy - SDG4 - Quality education - SDG9 - Industry innovation and infrastructure - SDG16 - Peace justice and strong institutions + SDG13 - Climate action + SDG8 - Decent work and economic growth + SDG15 - Life on land + SDG2 - Zero hunger + SDG17 - Partnerships for the goals + SDG10 - Reduced inequalities + SDG5 - Gender equality + SDG12 - Responsible consumption and production + SDG14 - Life below water + SDG6 - Clean water and sanitation + SDG11 - Sustainable cities and communities + SDG1 - No poverty + SDG3 - Good health and well being + SDG7 - Affordable and clean energy + SDG4 - Quality education + SDG9 - Industry innovation and infrastructure + SDG16 - Peace justice and strong institutions @@ -70,73 +70,73 @@ - modern art - monuments - europeana data model - sites - field walking - frescoes - LIDO metadata schema - art history - excavation - Arts and Humanities General - cities - coins - temples - numismatics - lithics - roads - environmental archaeology - digital cultural heritage - archaeological reports - history - CRMba - churches - cultural heritage - archaeological stratigraphy - religious art - buidings - digital humanities - survey - archaeological sites - linguistic studies - bioarchaeology - architectural orders - palaeoanthropology - fine arts - europeana - CIDOC CRM - decorations - classic art - stratigraphy - digital archaeology - intangible cultural heritage - walls - humanities - chapels - CRMtex - Language and Literature - paintings - archaeology - fair data - mosaics - burials - architecture - medieval art - castles - CARARE metadata schema - statues - natural language processing - inscriptions - CRMsci - vaults - contemporary art - Arts and Humanities - CRMarchaeo - pottery - site - architectural - vessels + modern art + monuments + europeana data model + sites + field walking + frescoes + LIDO metadata schema + art history + excavation + Arts and Humanities General + cities + coins + temples + numismatics + lithics + roads + environmental archaeology + digital cultural heritage + archaeological reports + history + CRMba + churches + cultural heritage + archaeological stratigraphy + religious art + buidings + digital humanities + survey + archaeological sites + linguistic studies + bioarchaeology + architectural orders + palaeoanthropology + fine arts + europeana + CIDOC CRM + decorations + classic art + stratigraphy + digital archaeology + intangible cultural heritage + walls + humanities + chapels + CRMtex + Language and Literature + paintings + archaeology + fair data + mosaics + burials + architecture + medieval art + castles + CARARE metadata schema + statues + natural language processing + inscriptions + CRMsci + vaults + contemporary art + Arts and Humanities + CRMarchaeo + pottery + site + architectural + vessels @@ -265,25 +265,25 @@ - Stock Assessment - pelagic - Acoustic - Fish farming - Fisheries - Fishermen - maximum sustainable yield - trawler - Fishing vessel - Fisherman - Fishing gear - mackerel - RFMO - Fish Aggregating Device - Bycatch - Fishery - common fisheries policy - Fishing fleet - Aquaculture + Stock Assessment + pelagic + Acoustic + Fish farming + Fisheries + Fishermen + maximum sustainable yield + trawler + Fishing vessel + Fisherman + Fishing gear + mackerel + RFMO + Fish Aggregating Device + Bycatch + Fishery + common fisheries policy + Fishing fleet + Aquaculture @@ -385,24 +385,24 @@ - brain mapping - brain imaging - electroencephalography - arterial spin labelling - brain fingerprinting - brain - neuroimaging - Multimodal Brain Image Analysis - fMRI - neuroinformatics - fetal brain - brain ultrasonic imaging - topographic brain mapping - diffusion tensor imaging - computerized knowledge assessment - connectome mapping - brain magnetic resonance imaging - brain abnormalities + brain mapping + brain imaging + electroencephalography + arterial spin labelling + brain fingerprinting + brain + neuroimaging + Multimodal Brain Image Analysis + fMRI + neuroinformatics + fetal brain + brain ultrasonic imaging + topographic brain mapping + diffusion tensor imaging + computerized knowledge assessment + connectome mapping + brain magnetic resonance imaging + brain abnormalities @@ -500,11 +500,11 @@ - marine - ocean - fish - aqua - sea + marine + ocean + fish + aqua + sea @@ -722,24 +722,24 @@ - animal production and health - fisheries and aquaculture - food safety and human nutrition - information management - food technology - agri-food education and extension - natural resources and environment - food system - engineering technology and Research - agriculture - food safety risk assessment - food security - farming practices and systems - plant production and protection - agri-food economics and policy - Agri-food - food distribution - forestry + animal production and health + fisheries and aquaculture + food safety and human nutrition + information management + food technology + agri-food education and extension + natural resources and environment + food system + engineering technology and Research + agriculture + food safety risk assessment + food security + farming practices and systems + plant production and protection + agri-food economics and policy + Agri-food + food distribution + forestry @@ -877,156 +877,156 @@ - Green Transport - City mobility systems - Vulnerable road users - Traffic engineering - Transport electrification - Mobility - Intermodal freight transport - Clean vehicle fleets - Intelligent mobility - Inflight refueling - District mobility systems - Navigation and control systems for optimised planning and routing - European Space Technology Platform - European Transport networks - Green cars - Inter-modality infrastructures - Advanced Take Off and Landing Ideas - Sustainable urban systems - port-area railway networks - Innovative forms of urban transport - Alliance for Logistics Innovation through Collaboration in Europe - Advisory Council for Aeronautics Research in Europe - Mobility services for people and goods - Guidance and traffic management - Passenger mobility - Smart mobility and services - transport innovation - high-speed railway - Vehicle design - Inland shipping - public transportation - aviation’s climate impact - Road transport - On-demand public transport - Personal Air Transport - Transport - transport vulnerability - Pipeline transport - European Association of Aviation Training and Education Organisations - Defrosting of railway infrastructure - Inclusive and affordable transport - River Information Services - jel:L92 - Increased use of public transport - Seamless mobility - STRIA - trolleybus transport - Intelligent Transport System - Low-emission alternative energy for transport - Shared mobility for people and goods - Business model for urban mobility - Interoperability of transport systems - Cross-border train slot booking - Air transport - Transport pricing - Sustainable transport - European Rail Transport Research Advisory Council - Alternative aircraft configurations - Transport and Mobility - Railways applications - urban transport - Environmental impact of transport - urban freight delivery systems - Automated Road Transport - Alternative fuels in public transport - Active LIDAR-sensor for GHG-measurements - Autonomous logistics operations - Rational use of motorised transport - Network and traffic management systems - electrification of railway wagons - Single European Sky - Electrified road systems - transportation planning - Railway dynamics - Motorway of the Sea - smart railway communications - Maritime transport - Environmental- friendly transport - Combined transport - Connected automated driving technology - Innovative freight logistics services - automated and shared vehicles - Alternative Aircraft Systems - Land-use and transport interaction - Public transport system - Business plan for shared mobility - Shared mobility - Growing of mobility demand - European Road Transport Research Advisory Council - WATERBORNE ETP - Effective transport management system - Short Sea Shipping - air traffic management - Sea hubs and the motorways of the sea - Urban mobility solutions - Smart city planning - Maritime spatial planning - EUropean rail Research Network of Excellence - Transport governance - ENERGY CONSUMPTION BY THE TRANSPORT SECTOR - Integrated urban plan - inland waterway services - European Conference of Transport Research Institutes - air vehicles - E-freight - Automated Driving - Automated ships - pricing for cross-border passenger transport - Vehicle efficiency - Railway transport - Electric vehicles - Road traffic monitoring - Deep sea shipping - Circular economy in transport - Traffic congestion - air transport system - Urban logistics - Rail transport - OpenStreetMap - high speed rail - Transportation engineering - Intermodal travel information - Flight Data Recorders - Advanced driver assistance systems - long distance freight transport - Inland waterway transport - Smart mobility - Mobility integration - Personal Rapid Transit system - Safety measures & requirements for roads - Green rail transport - Electrical - Vehicle manufacturing - Future Airport Layout - Rail technologies - European Intermodal Research Advisory Council - inland navigation - Automated urban vehicles - ECSS-standards - Traveller services - Polluting transport - Air Traffic Control - Cooperative and connected and automated transport - Innovative powertrains - Quality of transport system and services - door-to- door logistics chain - Inter-modal aspects of urban mobility - travel (and mobility) - Innovative freight delivery systems - urban freight delivery infrastructures + Green Transport + City mobility systems + Vulnerable road users + Traffic engineering + Transport electrification + Mobility + Intermodal freight transport + Clean vehicle fleets + Intelligent mobility + Inflight refueling + District mobility systems + Navigation and control systems for optimised planning and routing + European Space Technology Platform + European Transport networks + Green cars + Inter-modality infrastructures + Advanced Take Off and Landing Ideas + Sustainable urban systems + port-area railway networks + Innovative forms of urban transport + Alliance for Logistics Innovation through Collaboration in Europe + Advisory Council for Aeronautics Research in Europe + Mobility services for people and goods + Guidance and traffic management + Passenger mobility + Smart mobility and services + transport innovation + high-speed railway + Vehicle design + Inland shipping + public transportation + aviation’s climate impact + Road transport + On-demand public transport + Personal Air Transport + Transport + transport vulnerability + Pipeline transport + European Association of Aviation Training and Education Organisations + Defrosting of railway infrastructure + Inclusive and affordable transport + River Information Services + jel:L92 + Increased use of public transport + Seamless mobility + STRIA + trolleybus transport + Intelligent Transport System + Low-emission alternative energy for transport + Shared mobility for people and goods + Business model for urban mobility + Interoperability of transport systems + Cross-border train slot booking + Air transport + Transport pricing + Sustainable transport + European Rail Transport Research Advisory Council + Alternative aircraft configurations + Transport and Mobility + Railways applications + urban transport + Environmental impact of transport + urban freight delivery systems + Automated Road Transport + Alternative fuels in public transport + Active LIDAR-sensor for GHG-measurements + Autonomous logistics operations + Rational use of motorised transport + Network and traffic management systems + electrification of railway wagons + Single European Sky + Electrified road systems + transportation planning + Railway dynamics + Motorway of the Sea + smart railway communications + Maritime transport + Environmental- friendly transport + Combined transport + Connected automated driving technology + Innovative freight logistics services + automated and shared vehicles + Alternative Aircraft Systems + Land-use and transport interaction + Public transport system + Business plan for shared mobility + Shared mobility + Growing of mobility demand + European Road Transport Research Advisory Council + WATERBORNE ETP + Effective transport management system + Short Sea Shipping + air traffic management + Sea hubs and the motorways of the sea + Urban mobility solutions + Smart city planning + Maritime spatial planning + EUropean rail Research Network of Excellence + Transport governance + ENERGY CONSUMPTION BY THE TRANSPORT SECTOR + Integrated urban plan + inland waterway services + European Conference of Transport Research Institutes + air vehicles + E-freight + Automated Driving + Automated ships + pricing for cross-border passenger transport + Vehicle efficiency + Railway transport + Electric vehicles + Road traffic monitoring + Deep sea shipping + Circular economy in transport + Traffic congestion + air transport system + Urban logistics + Rail transport + OpenStreetMap + high speed rail + Transportation engineering + Intermodal travel information + Flight Data Recorders + Advanced driver assistance systems + long distance freight transport + Inland waterway transport + Smart mobility + Mobility integration + Personal Rapid Transit system + Safety measures & requirements for roads + Green rail transport + Electrical + Vehicle manufacturing + Future Airport Layout + Rail technologies + European Intermodal Research Advisory Council + inland navigation + Automated urban vehicles + ECSS-standards + Traveller services + Polluting transport + Air Traffic Control + Cooperative and connected and automated transport + Innovative powertrains + Quality of transport system and services + door-to- door logistics chain + Inter-modal aspects of urban mobility + travel (and mobility) + Innovative freight delivery systems + urban freight delivery infrastructures @@ -1194,13 +1194,13 @@ - Sustainability-oriented science policy - STI policies - science—society relations - Science & Technology Policy - Innovation policy - science policy - Policy and Law + Sustainability-oriented science policy + STI policies + science—society relations + Science & Technology Policy + Innovation policy + science policy + Policy and Law @@ -1298,18 +1298,18 @@ - COVID-19 - Severe acute respiratory syndrome coronavirus 2 - SARS-CoV-2 - COVID19 - 2019 novel coronavirus - coronavirus disease 2019 - HCoV-19 - mesh:C000657245 - 2019-nCoV - coronavirus disease-19 - mesh:COVID-19 - COVID2019 + COVID-19 + Severe acute respiratory syndrome coronavirus 2 + SARS-CoV-2 + COVID19 + 2019 novel coronavirus + coronavirus disease 2019 + HCoV-19 + mesh:C000657245 + 2019-nCoV + coronavirus disease-19 + mesh:COVID-19 + COVID2019