D-Net
/
dhp-schemas
9
1
Fork 0
Code Issues 1 Pull Requests 5 Projects Releases 1 Wiki Activity

[Datasource / Service] datasource_model_eosc #16

Merged
claudio.atzori merged 9 commits from datasource_model_eosc into master 2022-05-03 11:45:40 +02:00
Conversation 1 Commits 9 Files Changed 3 +22 -4
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 78cf7ea084 - Show all commits

26
src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java
View File

@ -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);
}