}
else if(property.equals(PROPERTY_PUBLICATION_YEAR)){
if (cdmBase.getDatePublished() != null){
- String result = cdmBase.getDatePublished().getYear();
- if (!cdmBase.getDatePublished().getYear().equals(cdmBase.getDatePublishedString()) && cdmBase.getDatePublishedString() != null) {
+ String result = "";
+ if (cdmBase.getDatePublished().getYear() != null){
+ result = cdmBase.getDatePublished().getYear();
+ }
+ if (cdmBase.getDatePublishedString() != null && !result.equals(cdmBase.getDatePublishedString()) ) {
result += " (" + cdmBase.getDatePublishedString()+")";
}
return result ;
}else if(cdmBase.getDatePublished() == null && cdmBase.getInReference() != null ){
- String result = cdmBase.getInReference().getDatePublished().getYear();
- if (!cdmBase.getInReference().getDatePublished().getYear().equals(cdmBase.getInReference().getDatePublishedString()) ) {
+ String result = "";
+ if (cdmBase.getInReference().getDatePublished() != null && cdmBase.getInReference().getDatePublished().getYear() != null){
+ result = cdmBase.getInReference().getDatePublished().getYear();
+ }
+ if (cdmBase.getInReference().getDatePublishedString() != null && !result.equals(cdmBase.getInReference().getDatePublishedString()) ) {
result += " (" + cdmBase.getInReference().getDatePublishedString()+")";
}
return result ;