Mercurial > hg > ismi-richfaces
changeset 212:310f512f66af
fix NPE in DigitalizationTemplate if num_files attribute is missing.
| author | casties |
|---|---|
| date | Mon, 04 Nov 2019 15:45:56 +0100 |
| parents | 631864bfec2e |
| children | 38c13c8e9b78 |
| files | src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java src/main/webapp/imageServer/displayDigiList.xhtml |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java Fri Oct 04 17:42:27 2019 +0200 +++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java Mon Nov 04 15:45:56 2019 +0100 @@ -3,6 +3,7 @@ import java.util.List; import org.mpi.openmind.cache.WrapperService; +import org.mpi.openmind.repository.bo.Attribute; import org.mpi.openmind.repository.bo.Entity; public class DigitalizationTemplate implements Comparable<DigitalizationTemplate>{ @@ -25,7 +26,10 @@ public void init(){ this.initialized = true; - this.pages = om.getAttributeByName(entity.getId(), "num_files").getValue(); + Attribute nfAtt = om.getAttributeByName(entity.getId(), "num_files"); + if (nfAtt != null) { + this.pages = nfAtt.getValue(); + } List<Entity> list = om.getTargetsForSourceRelation(entity, "is_digitalization_of", "CODEX", 1); if(list.size() > 0){
--- a/src/main/webapp/imageServer/displayDigiList.xhtml Fri Oct 04 17:42:27 2019 +0200 +++ b/src/main/webapp/imageServer/displayDigiList.xhtml Mon Nov 04 15:45:56 2019 +0100 @@ -96,13 +96,6 @@ <rich:column style="border:none;"> <f:facet name="header"> - <h:outputText value="#Pages" /> - </f:facet> - <h:outputText value="#{digi.pages}" /> - </rich:column> - - <rich:column style="border:none;"> - <f:facet name="header"> <h:outputText value="Titles in this Codex" /> </f:facet> <h:outputText value="Known Witnesses" rendered="#{!empty digi.titlesInCodex}"/>