master #59

Closed
claudio.atzori wants to merge 3221 commits from master into stable_ids
1 changed files with 12 additions and 11 deletions
Showing only changes of commit 59530a14fb - Show all commits

View File

@ -258,17 +258,18 @@ object DoiBoostMappingUtil {
i.setHostedby(hb) i.setHostedby(hb)
}) })
val ar = publication.getInstance().asScala.filter(i => i.getInstancetype != null && i.getAccessright!= null && i.getAccessright.getClassid!= null).map(f=> f.getAccessright.getClassid) publication.setBestaccessright(OafMapperUtils.createBestAccessRights(publication.getInstance()))
if (ar.nonEmpty) { // val ar = publication.getInstance().asScala.filter(i => i.getInstancetype != null && i.getAccessright!= null && i.getAccessright.getClassid!= null).map(f=> f.getAccessright.getClassid)
if(ar.contains(ModelConstants.ACCESS_RIGHT_OPEN)){ // if (ar.nonEmpty) {
val ar = getOpenAccessQualifier() // if(ar.contains(ModelConstants.ACCESS_RIGHT_OPEN)){
publication.setBestaccessright(OafMapperUtils.qualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename)) // val ar = getOpenAccessQualifier()
} // publication.setBestaccessright(OafMapperUtils.qualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename))
else { // }
val ar = getRestrictedQualifier() // else {
publication.setBestaccessright(OafMapperUtils.qualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename)) // val ar = getRestrictedQualifier()
} // publication.setBestaccessright(OafMapperUtils.qualifier(ar.getClassid, ar.getClassname, ar.getSchemeid, ar.getSchemename))
} // }
// }
publication publication
} }