Mercurial > hg > ismi-richfaces
changeset 184:135b29621a32
Fix bug with digitalizations having no own value.
| author | Robert Casties <casties@mpiwg-berlin.mpg.de> |
|---|---|
| date | Fri, 27 Jul 2018 14:23:46 +0200 |
| parents | ee8a923319ec |
| children | 81297da1cb83 |
| files | src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java src/main/resources/own-value.cfg.xml |
| diffstat | 2 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java Tue Jul 03 16:47:16 2018 +0200 +++ b/src/main/java/de/mpiwg/itgroup/ismi/utils/templates/DigitalizationTemplate.java Fri Jul 27 14:23:46 2018 +0200 @@ -67,7 +67,18 @@ return titlesInCodex; } - public int compareTo(DigitalizationTemplate o) { + public int compareTo(DigitalizationTemplate o) { + boolean thisnull = (this.entity == null || this.entity.getOwnValue() == null); + boolean thatnull = (o.entity == null || o.entity.getOwnValue() == null); + if (thisnull && thatnull) { + return 0; + } + if (thisnull) { + return -1; + } + if (thatnull) { + return 1; + } return this.entity.getOwnValue().compareTo(o.getEntity().getOwnValue()); } }
--- a/src/main/resources/own-value.cfg.xml Tue Jul 03 16:47:16 2018 +0200 +++ b/src/main/resources/own-value.cfg.xml Fri Jul 27 14:23:46 2018 +0200 @@ -26,6 +26,10 @@ <attribute name="name" end-node="true"/> </own-value-rule> + <own-value-rule id="digitalization0"> + <attribute name="name" end-node="true"/> + </own-value-rule> + <own-value-rule id="alias0"> <attribute name="alias" end-node="true"/> </own-value-rule> @@ -353,10 +357,15 @@ <entry own-value-rule="reference0"/> </print-rule> - <print-rule for="FLORUIT_DATE"> + <print-rule for="FLORUIT_DATE"> <formatstr value="%floruit%"/> <entry own-value-rule="floruit"/> </print-rule> + + <print-rule for="DIGITALIZATION"> + <formatstr value="%digitalization0%"/> + <entry own-value-rule="digitalization0"/> + </print-rule> </print-rules>