From f9f64ba93f3cd6ebd91a5358cfe0ba340b722667 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Wed, 13 Oct 2021 11:29:32 +0200 Subject: [PATCH 1/8] add parent/child rels --- .../java/eu/dnetlib/dhp/schema/common/ModelConstants.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java index 5c08765..ed9bf48 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java @@ -148,6 +148,10 @@ public class ModelConstants { public static final String IS_DIFFERENT_FROM = "isDifferentFrom"; + public static final String HIERARCHY = "hierarchy"; // subreltype + public static final String IS_PARENT_OF = "isParentOf"; + public static final String IS_CHILD_OF = "isChildOf"; + public static final String UNKNOWN = "UNKNOWN"; public static final String NOT_AVAILABLE = "not available"; -- 2.17.1 From b287c80cc1511dbe707f5420879a558cef184e74 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 26 Apr 2022 10:17:50 +0200 Subject: [PATCH 2/8] deprecated odlanguages, added languages --- .../java/eu/dnetlib/dhp/schema/oaf/Datasource.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 7e59372..99fcd8d 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -46,8 +46,11 @@ public class Datasource extends OafEntity implements Serializable { private Field odpolicies; + @Deprecated private List> odlanguages; + private List languages; + private List> odcontenttypes; private List> accessinfopackage; @@ -258,6 +261,14 @@ public class Datasource extends OafEntity implements Serializable { this.odlanguages = odlanguages; } + public List getLanguages() { + return languages; + } + + public void setLanguages(List languages) { + this.languages = languages; + } + public List> getOdcontenttypes() { return odcontenttypes; } -- 2.17.1 From eeef59765e0a77d70d8c8b5a44283daa35303585 Mon Sep 17 00:00:00 2001 From: "michele.artini" Date: Tue, 26 Apr 2022 11:12:37 +0200 Subject: [PATCH 3/8] some comments --- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 55 +++++++++++++++++-- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 99fcd8d..11a6246 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -40,10 +40,13 @@ public class Datasource extends OafEntity implements Serializable { private List subjects; // opendoar specific fields (od*) + @Deprecated private Field odnumberofitems; + @Deprecated private Field odnumberofitemsdate; + @Deprecated private Field odpolicies; @Deprecated @@ -51,6 +54,8 @@ public class Datasource extends OafEntity implements Serializable { private List languages; + @Deprecated + // TO REMOVE ? private List> odcontenttypes; private List> accessinfopackage; @@ -117,6 +122,48 @@ public class Datasource extends OafEntity implements Serializable { private String consenttermsofusedate; + // Campi da togliere: + + // _typology_to_remove_ + // od* + // versioning (replaced by version_control) + + // Campi da aggiungere: + + // dedup_main_service + // lastconsenttermsofusedate + // status + // eosc_type + // eosc_datasource_type + // version_control + // research_entity_types (potrebbe essere providedentitytypes ???) + // submission_policy_url + // preservation_policy_url + // research_product_access_policies + // research_product_metadata_access_policies + + // Campi ignorati: + + // timezone + // platform + // provenanceaction + // activationid + // dateofcollection + // aggregator + // managed + // registeredby + // registrationdate + + // Journal fields (???) + + // issn + // eissn + // lissn + + // Generated by Haddop Jobs (???) + providedentitytypes + providedproducttypes + public Qualifier getDatasourcetype() { return datasourcetype; } @@ -265,7 +312,7 @@ public class Datasource extends OafEntity implements Serializable { return languages; } - public void setLanguages(List languages) { + public void setLanguages(final List languages) { this.languages = languages; } @@ -465,7 +512,7 @@ public class Datasource extends OafEntity implements Serializable { return consenttermsofuse; } - public void setConsenttermsofuse(Boolean consenttermsofuse) { + public void setConsenttermsofuse(final Boolean consenttermsofuse) { this.consenttermsofuse = consenttermsofuse; } @@ -473,7 +520,7 @@ public class Datasource extends OafEntity implements Serializable { return fulltextdownload; } - public void setFulltextdownload(Boolean fulltextdownload) { + public void setFulltextdownload(final Boolean fulltextdownload) { this.fulltextdownload = fulltextdownload; } @@ -481,7 +528,7 @@ public class Datasource extends OafEntity implements Serializable { return consenttermsofusedate; } - public void setConsenttermsofusedate(String consenttermsofusedate) { + public void setConsenttermsofusedate(final String consenttermsofusedate) { this.consenttermsofusedate = consenttermsofusedate; } -- 2.17.1 From 97663bd79f0c3c75409edc8914a5d53ae793b3a2 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 26 Apr 2022 16:19:01 +0200 Subject: [PATCH 4/8] EOSC Services - ongoing update --- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 150 +++++++++++------- 1 file changed, 91 insertions(+), 59 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 11a6246..75467d3 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -11,10 +11,16 @@ public class Datasource extends OafEntity implements Serializable { */ private static final long serialVersionUID = 1019089598408414496L; + @Deprecated private Qualifier datasourcetype; + @Deprecated private Qualifier datasourcetypeui; + private Qualifier eosctype; // Data Source | Service + + private Qualifier eoscdatasourcetype; + private Qualifier openairecompatibility; private Field officialname; @@ -55,7 +61,6 @@ public class Datasource extends OafEntity implements Serializable { private List languages; @Deprecated - // TO REMOVE ? private List> odcontenttypes; private List> accessinfopackage; @@ -67,8 +72,10 @@ public class Datasource extends OafEntity implements Serializable { private Field missionstatementurl; + @Deprecated private Field dataprovider; + @Deprecated private Field serviceprovider; // {open, restricted or closed} @@ -83,23 +90,24 @@ public class Datasource extends OafEntity implements Serializable { // {feeRequired, registration, other} private Field datauploadrestriction; + @Deprecated private Field versioning; - private Field citationguidelineurl; + private Boolean versioncontrol; - // {yes, no, uknown} - private Field qualitymanagementkind; + private Field citationguidelineurl; private Field pidsystems; private Field certificates; + @Deprecated private List policies; private Journal journal; // New field for EOSC - private List providedentitytypes; + private List researchentitytypes; // New field for EOSC private List providedproducttypes; @@ -116,53 +124,21 @@ public class Datasource extends OafEntity implements Serializable { // New field for EOSC private List contentpolicies; + private String submissionpolicyurl; + + private String preservationpolicyurl; + + private List researchproductaccesspolicies; + + private List researchproductmetadataaccesspolicies; + private Boolean consenttermsofuse; private Boolean fulltextdownload; private String consenttermsofusedate; - // Campi da togliere: - - // _typology_to_remove_ - // od* - // versioning (replaced by version_control) - - // Campi da aggiungere: - - // dedup_main_service - // lastconsenttermsofusedate - // status - // eosc_type - // eosc_datasource_type - // version_control - // research_entity_types (potrebbe essere providedentitytypes ???) - // submission_policy_url - // preservation_policy_url - // research_product_access_policies - // research_product_metadata_access_policies - - // Campi ignorati: - - // timezone - // platform - // provenanceaction - // activationid - // dateofcollection - // aggregator - // managed - // registeredby - // registrationdate - - // Journal fields (???) - - // issn - // eissn - // lissn - - // Generated by Haddop Jobs (???) - providedentitytypes - providedproducttypes + private String lastconsenttermsofusedate; public Qualifier getDatasourcetype() { return datasourcetype; @@ -180,6 +156,22 @@ public class Datasource extends OafEntity implements Serializable { this.datasourcetypeui = datasourcetypeui; } + public Qualifier getEosctype() { + return eosctype; + } + + public void setEosctype(Qualifier eosctype) { + this.eosctype = eosctype; + } + + public Qualifier getEoscdatasourcetype() { + return eoscdatasourcetype; + } + + public void setEoscdatasourcetype(Qualifier eoscdatasourcetype) { + this.eoscdatasourcetype = eoscdatasourcetype; + } + public Qualifier getOpenairecompatibility() { return openairecompatibility; } @@ -412,6 +404,14 @@ public class Datasource extends OafEntity implements Serializable { this.versioning = versioning; } + public Boolean getVersioncontrol() { + return versioncontrol; + } + + public void setVersioncontrol(Boolean versioncontrol) { + this.versioncontrol = versioncontrol; + } + public Field getCitationguidelineurl() { return citationguidelineurl; } @@ -420,14 +420,6 @@ public class Datasource extends OafEntity implements Serializable { this.citationguidelineurl = citationguidelineurl; } - public Field getQualitymanagementkind() { - return qualitymanagementkind; - } - - public void setQualitymanagementkind(final Field qualitymanagementkind) { - this.qualitymanagementkind = qualitymanagementkind; - } - public Field getPidsystems() { return pidsystems; } @@ -460,12 +452,12 @@ public class Datasource extends OafEntity implements Serializable { this.journal = journal; } - public List getProvidedentitytypes() { - return providedentitytypes; + public List getResearchentitytypes() { + return researchentitytypes; } - public void setProvidedentitytypes(final List providedentitytypes) { - this.providedentitytypes = providedentitytypes; + public void setResearchentitytypes(final List researchentitytypes) { + this.researchentitytypes = researchentitytypes; } public List getProvidedproducttypes() { @@ -508,6 +500,38 @@ public class Datasource extends OafEntity implements Serializable { this.contentpolicies = contentpolicies; } + public String getSubmissionpolicyurl() { + return submissionpolicyurl; + } + + public void setSubmissionpolicyurl(String submissionpolicyurl) { + this.submissionpolicyurl = submissionpolicyurl; + } + + public String getPreservationpolicyurl() { + return preservationpolicyurl; + } + + public void setPreservationpolicyurl(String preservationpolicyurl) { + this.preservationpolicyurl = preservationpolicyurl; + } + + public List getResearchproductaccesspolicies() { + return researchproductaccesspolicies; + } + + public void setResearchproductaccesspolicies(List researchproductaccesspolicies) { + this.researchproductaccesspolicies = researchproductaccesspolicies; + } + + public List getResearchproductmetadataaccesspolicies() { + return researchproductmetadataaccesspolicies; + } + + public void setResearchproductmetadataaccesspolicies(List researchproductmetadataaccesspolicies) { + this.researchproductmetadataaccesspolicies = researchproductmetadataaccesspolicies; + } + public Boolean getConsenttermsofuse() { return consenttermsofuse; } @@ -516,6 +540,14 @@ public class Datasource extends OafEntity implements Serializable { this.consenttermsofuse = consenttermsofuse; } + public String getLastconsenttermsofusedate() { + return lastconsenttermsofusedate; + } + + public void setLastconsenttermsofusedate(String lastconsenttermsofusedate) { + this.lastconsenttermsofusedate = lastconsenttermsofusedate; + } + public Boolean getFulltextdownload() { return fulltextdownload; } @@ -637,7 +669,7 @@ public class Datasource extends OafEntity implements Serializable { journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal; - providedentitytypes = mergeLists(providedentitytypes, d.getProvidedentitytypes());; + researchentitytypes = mergeLists(researchentitytypes, d.getResearchentitytypes());; providedproducttypes = mergeLists(providedproducttypes, d.getProvidedproducttypes());; -- 2.17.1 From 78cf7ea08410607d97ea421ba7ede1fdaadabdb6 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 27 Apr 2022 09:23:57 +0200 Subject: [PATCH 5/8] EOSC Services - ongoing update --- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 75467d3..0f539d9 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -578,6 +578,12 @@ public class Datasource extends OafEntity implements Serializable { datasourcetypeui = d.getDatasourcetypeui() != null && compareTrust(this, e) < 0 ? d.getDatasourcetypeui() : datasourcetypeui; + eosctype = d.getEosctype() != null && compareTrust(this, e) < 0 + ? d.getEosctype() + : eosctype; + eoscdatasourcetype = d.getEoscdatasourcetype() != null && compareTrust(this, e) < 0 + ? d.getEoscdatasourcetype() + : eoscdatasourcetype; openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0 ? d.getOpenairecompatibility() : openairecompatibility; @@ -651,14 +657,13 @@ public class Datasource extends OafEntity implements Serializable { : datauploadrestriction; versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning; + versioncontrol = d.getVersioncontrol() != null && compareTrust(this, e) < 0 + ? d.getVersioncontrol() + : versioncontrol; citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0 ? d.getCitationguidelineurl() : citationguidelineurl; - // {yes, no, unknown} - qualitymanagementkind = d.getQualitymanagementkind() != null && compareTrust(this, e) < 0 - ? d.getQualitymanagementkind() - : qualitymanagementkind; pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems; certificates = d.getCertificates() != null && compareTrust(this, e) < 0 @@ -669,6 +674,10 @@ public class Datasource extends OafEntity implements Serializable { journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal; + researchentitytypes = d.getResearchentitytypes() != null && compareTrust(this, e) < 0 + ? d.getResearchentitytypes() + : researchentitytypes; + researchentitytypes = mergeLists(researchentitytypes, d.getResearchentitytypes());; providedproducttypes = mergeLists(providedproducttypes, d.getProvidedproducttypes());; @@ -687,6 +696,15 @@ public class Datasource extends OafEntity implements Serializable { contentpolicies = mergeLists(contentpolicies, d.getContentpolicies());; + submissionpolicyurl = d.getSubmissionpolicyurl() != null && compareTrust(this, e) < 0 + ? d.getSubmissionpolicyurl() + : submissionpolicyurl; + preservationpolicyurl = d.getPreservationpolicyurl() != null && compareTrust(this, e) < 0 + ? d.getPreservationpolicyurl() + : preservationpolicyurl; + researchproductaccesspolicies = mergeLists(researchproductaccesspolicies, d.getResearchproductaccesspolicies()); + researchproductmetadataaccesspolicies = mergeLists(researchproductmetadataaccesspolicies, d.getResearchproductmetadataaccesspolicies()); + mergeOAFDataInfo(e); } -- 2.17.1 From cbca60011ec21198a868fe6864bd04e95cfa7cbb Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Wed, 27 Apr 2022 09:28:18 +0200 Subject: [PATCH 6/8] cleanup --- pom.xml | 3 +-- .../java/eu/dnetlib/dhp/schema/common/ModelConstants.java | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a69fbfd..bac1262 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 2.11.34-SNAPSHOT - + 2.11.34-eosc-SNAPSHOT diff --git a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java index 686945a..1f32c33 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java +++ b/src/main/java/eu/dnetlib/dhp/schema/common/ModelConstants.java @@ -175,10 +175,6 @@ public class ModelConstants { public static final String IS_DIFFERENT_FROM = "isDifferentFrom"; - public static final String HIERARCHY = "hierarchy"; // subreltype - public static final String IS_PARENT_OF = "isParentOf"; - public static final String IS_CHILD_OF = "isChildOf"; - public static final String UNKNOWN = "UNKNOWN"; public static final String NOT_AVAILABLE = "not available"; -- 2.17.1 From 1a4173d0e6ec2057a85f290b86d1150db684404d Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 3 May 2022 10:43:24 +0200 Subject: [PATCH 7/8] EOSC Services - removed field knowledgegraph --- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 0f539d9..510df87 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -118,9 +118,6 @@ public class Datasource extends OafEntity implements Serializable { // New field for EOSC private Boolean thematic; - // New field for EOSC - private Boolean knowledgegraph; - // New field for EOSC private List contentpolicies; @@ -484,14 +481,6 @@ public class Datasource extends OafEntity implements Serializable { this.thematic = thematic; } - public Boolean getKnowledgegraph() { - return knowledgegraph; - } - - public void setKnowledgegraph(final Boolean knowledgegraph) { - this.knowledgegraph = knowledgegraph; - } - public List getContentpolicies() { return contentpolicies; } @@ -690,10 +679,6 @@ public class Datasource extends OafEntity implements Serializable { ? d.getThematic() : thematic; - knowledgegraph = d.getKnowledgegraph() != null && compareTrust(this, e) < 0 - ? d.getKnowledgegraph() - : knowledgegraph; - contentpolicies = mergeLists(contentpolicies, d.getContentpolicies());; submissionpolicyurl = d.getSubmissionpolicyurl() != null && compareTrust(this, e) < 0 -- 2.17.1 From b5e20b558d316f9b26d9612eddf5204bfb9c5768 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 3 May 2022 11:45:12 +0200 Subject: [PATCH 8/8] datasources do not need to be merged by the graph processing pipeline; bumped pom version; updated CHANGELOG --- CHANGES.md | 5 +- pom.xml | 2 +- .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 135 ------------------ 3 files changed, 4 insertions(+), 138 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6b0a2ff..9e73eb0 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,8 +2,9 @@ ## Changelog -| **Version** | **Changes** | **Readiness** | -|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---| +| **Version** | **Changes** | **Readiness** | +|-------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---| +| 2.12.0 | [Graph model]
  • Introducing EOSC Services as datasources
      • | beta | | 2.11.33 | [Scholexplorer]
      • Moved Scholix API Data model into dhp-schemas
      • implementation of the compareTo method on Scholix objects and all model properties
      • Unit Test to verify that compareTo works on different case
          • | beta | | 2.10.31 | [Minor]
          NPE checks | beta | | 2.10.30 | [Minor]
          added comparator for refereed field instances | beta | diff --git a/pom.xml b/pom.xml index bac1262..ff8ae1e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp-schemas jar - 2.11.34-eosc-SNAPSHOT + 2.12.0-SNAPSHOT diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java index 510df87..54cfc8a 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -556,141 +556,6 @@ public class Datasource extends OafEntity implements Serializable { @Override public void mergeFrom(final OafEntity e) { super.mergeFrom(e); - - if (!Datasource.class.isAssignableFrom(e.getClass())) { return; } - - final Datasource d = (Datasource) e; - - datasourcetype = d.getDatasourcetype() != null && compareTrust(this, e) < 0 - ? d.getDatasourcetype() - : datasourcetype; - datasourcetypeui = d.getDatasourcetypeui() != null && compareTrust(this, e) < 0 - ? d.getDatasourcetypeui() - : datasourcetypeui; - eosctype = d.getEosctype() != null && compareTrust(this, e) < 0 - ? d.getEosctype() - : eosctype; - eoscdatasourcetype = d.getEoscdatasourcetype() != null && compareTrust(this, e) < 0 - ? d.getEoscdatasourcetype() - : eoscdatasourcetype; - openairecompatibility = d.getOpenairecompatibility() != null && compareTrust(this, e) < 0 - ? d.getOpenairecompatibility() - : openairecompatibility; - officialname = d.getOfficialname() != null && compareTrust(this, e) < 0 - ? d.getOfficialname() - : officialname; - englishname = d.getEnglishname() != null && compareTrust(this, e) < 0 ? d.getEnglishname() : officialname; - websiteurl = d.getWebsiteurl() != null && compareTrust(this, e) < 0 ? d.getWebsiteurl() : websiteurl; - logourl = d.getLogourl() != null && compareTrust(this, e) < 0 ? d.getLogourl() : getLogourl(); - contactemail = d.getContactemail() != null && compareTrust(this, e) < 0 - ? d.getContactemail() - : contactemail; - namespaceprefix = d.getNamespaceprefix() != null && compareTrust(this, e) < 0 - ? d.getNamespaceprefix() - : namespaceprefix; - latitude = d.getLatitude() != null && compareTrust(this, e) < 0 ? d.getLatitude() : latitude; - longitude = d.getLongitude() != null && compareTrust(this, e) < 0 ? d.getLongitude() : longitude; - dateofvalidation = d.getDateofvalidation() != null && compareTrust(this, e) < 0 - ? d.getDateofvalidation() - : dateofvalidation; - description = d.getDescription() != null && compareTrust(this, e) < 0 ? d.getDescription() : description; - subjects = mergeLists(subjects, d.getSubjects()); - - // opendoar specific fields (od*) - odnumberofitems = d.getOdnumberofitems() != null && compareTrust(this, e) < 0 - ? d.getOdnumberofitems() - : odnumberofitems; - odnumberofitemsdate = d.getOdnumberofitemsdate() != null && compareTrust(this, e) < 0 - ? d.getOdnumberofitemsdate() - : odnumberofitemsdate; - odpolicies = d.getOdpolicies() != null && compareTrust(this, e) < 0 ? d.getOdpolicies() : odpolicies; - odlanguages = mergeLists(odlanguages, d.getOdlanguages()); - odcontenttypes = mergeLists(odcontenttypes, d.getOdcontenttypes()); - accessinfopackage = mergeLists(accessinfopackage, d.getAccessinfopackage()); - - // re3data fields - releasestartdate = d.getReleasestartdate() != null && compareTrust(this, e) < 0 - ? d.getReleasestartdate() - : releasestartdate; - releaseenddate = d.getReleaseenddate() != null && compareTrust(this, e) < 0 - ? d.getReleaseenddate() - : releaseenddate; - missionstatementurl = d.getMissionstatementurl() != null && compareTrust(this, e) < 0 - ? d.getMissionstatementurl() - : missionstatementurl; - dataprovider = d.getDataprovider() != null && compareTrust(this, e) < 0 - ? d.getDataprovider() - : dataprovider; - serviceprovider = d.getServiceprovider() != null && compareTrust(this, e) < 0 - ? d.getServiceprovider() - : serviceprovider; - - // {open, restricted or closed} - databaseaccesstype = d.getDatabaseaccesstype() != null && compareTrust(this, e) < 0 - ? d.getDatabaseaccesstype() - : databaseaccesstype; - - // {open, restricted or closed} - datauploadtype = d.getDatauploadtype() != null && compareTrust(this, e) < 0 - ? d.getDatauploadtype() - : datauploadtype; - - // {feeRequired, registration, other} - databaseaccessrestriction = d.getDatabaseaccessrestriction() != null && compareTrust(this, e) < 0 - ? d.getDatabaseaccessrestriction() - : databaseaccessrestriction; - - // {feeRequired, registration, other} - datauploadrestriction = d.getDatauploadrestriction() != null && compareTrust(this, e) < 0 - ? d.getDatauploadrestriction() - : datauploadrestriction; - - versioning = d.getVersioning() != null && compareTrust(this, e) < 0 ? d.getVersioning() : versioning; - versioncontrol = d.getVersioncontrol() != null && compareTrust(this, e) < 0 - ? d.getVersioncontrol() - : versioncontrol; - citationguidelineurl = d.getCitationguidelineurl() != null && compareTrust(this, e) < 0 - ? d.getCitationguidelineurl() - : citationguidelineurl; - - pidsystems = d.getPidsystems() != null && compareTrust(this, e) < 0 ? d.getPidsystems() : pidsystems; - - certificates = d.getCertificates() != null && compareTrust(this, e) < 0 - ? d.getCertificates() - : certificates; - - policies = mergeLists(policies, d.getPolicies()); - - journal = d.getJournal() != null && compareTrust(this, e) < 0 ? d.getJournal() : journal; - - researchentitytypes = d.getResearchentitytypes() != null && compareTrust(this, e) < 0 - ? d.getResearchentitytypes() - : researchentitytypes; - - researchentitytypes = mergeLists(researchentitytypes, d.getResearchentitytypes());; - - providedproducttypes = mergeLists(providedproducttypes, d.getProvidedproducttypes());; - - jurisdiction = d.getJurisdiction() != null && compareTrust(this, e) < 0 - ? d.getJurisdiction() - : jurisdiction; - - thematic = d.getThematic() != null && compareTrust(this, e) < 0 - ? d.getThematic() - : thematic; - - contentpolicies = mergeLists(contentpolicies, d.getContentpolicies());; - - submissionpolicyurl = d.getSubmissionpolicyurl() != null && compareTrust(this, e) < 0 - ? d.getSubmissionpolicyurl() - : submissionpolicyurl; - preservationpolicyurl = d.getPreservationpolicyurl() != null && compareTrust(this, e) < 0 - ? d.getPreservationpolicyurl() - : preservationpolicyurl; - researchproductaccesspolicies = mergeLists(researchproductaccesspolicies, d.getResearchproductaccesspolicies()); - researchproductmetadataaccesspolicies = mergeLists(researchproductmetadataaccesspolicies, d.getResearchproductmetadataaccesspolicies()); - - mergeOAFDataInfo(e); } } -- 2.17.1