add child records count to number of links in tab title. Refs #330

clarin-eric · Jan 27, 2022 · 5892e29 · 5892e29
1 parent 92a6973
commit 5892e29
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/RecordMetadataLinksCountModel.java b/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/RecordMetadataLinksCountModel.java
@@ -39,12 +39,13 @@ public Integer getObject() {
         final FieldNameService fieldNameService = VloWicketApplication.get().getFieldNameService();
 
         final SolrDocument document = documentModel.getObject();
-        final Object partCount = document.getFieldValue(fieldNameService.getFieldName(FieldKey.HAS_PART_COUNT));
-        if (partCount instanceof Integer) {
-            return (Integer) partCount;
-        } else {
-            return 0;
+        if (document != null) {
+            final Object partCount = document.getFieldValue(fieldNameService.getFieldName(FieldKey.HAS_PART_COUNT));
+            if (partCount instanceof Integer) {
+                return (Integer) partCount;
+            }
         }
+        return 0;
     }
 
     @Override

diff --git a/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java b/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/RecordPage.java
@@ -45,6 +45,7 @@
 import eu.clarin.cmdi.vlo.wicket.model.NullFallbackModel;
 import eu.clarin.cmdi.vlo.wicket.model.PermaLinkModel;
 import eu.clarin.cmdi.vlo.wicket.model.RecordHasHierarchyModel;
+import eu.clarin.cmdi.vlo.wicket.model.RecordMetadataLinksCountModel;
 import eu.clarin.cmdi.vlo.wicket.model.SearchContextModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrDocumentModel;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldStringModel;
@@ -203,14 +204,15 @@ public RecordPage(PageParameters params) {
             add(new RecordStructuredMeatadataHeaderBehavior(documentModel));
         }
 
+        final IModel<Integer> childRecordsCountModel = new RecordMetadataLinksCountModel(getModel());
         linksCountLabelModel = new LoadableDetachableModel<String>() {
             @Override
             protected String load() {
                 final SolrDocument document = RecordPage.this.getModelObject();
                 if (document != null) {
                     final Object countValue = document.getFieldValue(fieldNameService.getFieldName(FieldKey.RESOURCE_COUNT));
                     if (countValue instanceof Integer) {
-                        Long fieldValuesCount
+                        final Long fieldValuesCount
                                 = Streams.concat(
                                         // landing page links
                                         Optional.ofNullable(document.getFieldValues(fieldNameService.getFieldName(FieldKey.LANDINGPAGE))).map(f -> f.stream()).orElse(Stream.empty()),
@@ -220,7 +222,9 @@ protected String load() {
                                         showFcsLinks
                                                 ? Optional.ofNullable(document.getFieldValues(fieldNameService.getFieldName(FieldKey.SEARCH_SERVICE))).map(f -> f.stream()).orElse(Stream.empty())
                                                 : Stream.empty())
-                                        .collect(Collectors.counting());
+                                        .collect(Collectors.counting())
+                                // add child records
+                                + childRecordsCountModel.getObject();
                         if (fieldValuesCount == 0) {
                             return ((Integer) countValue).toString();
                         } else {