#894 fix inclusion of conservation list values in facet download

AtlasOfLivingAustralia · Apr 11, 2024 · 47ed309 · 47ed309
1 parent fd8829a
commit 47ed309
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -40,7 +40,7 @@ repositories {
 }
 
 group = 'au.org.ala'
-version = '3.4.0'
+version = '3.4.1'
 
 
 boolean inplace = false

diff --git a/src/main/java/au/org/ala/biocache/service/ListsService.java b/src/main/java/au/org/ala/biocache/service/ListsService.java
@@ -123,7 +123,7 @@ private Map<String, Set<String>> getItemsMap(Map speciesLists, boolean conservat
                 String status = "";
                 if (item.kvpValues != null) {
                     for (KvpDTO m : item.kvpValues) {
-                        if (m.key != null) {
+                        if (m.key != null && "status".equalsIgnoreCase(m.key)) {
                             status = ": " + m.value;
                         }
                     }

diff --git a/src/main/java/au/org/ala/biocache/web/OccurrenceController.java b/src/main/java/au/org/ala/biocache/web/OccurrenceController.java
@@ -1023,14 +1023,14 @@ private void writeExpandedListColumns(File tmp, HttpServletResponse response) th
                 if (StringUtils.isNotEmpty(row[invasiveColumn])) {
                     String [] values = row[invasiveColumn].split("\\|");
                     for (String v : values) {
-                        invasiveFields.add(v);
+                        invasiveFields.add(v.trim());
                     }
                 }
                 if (StringUtils.isNotEmpty(row[conservationColumn])) {
                     // remove trailing value to find list name
-                    String [] values = row[conservationColumn].split("\\|");
+                    String[] values = row[conservationColumn].split("\\|");
                     for (String v : values) {
-                        conservationFields.add(v.replaceAll(": [^:]*$", ""));
+                        conservationFields.add(v.replaceAll(": [^:]*$", "").trim());
                     }
                 }
             }
@@ -1052,13 +1052,16 @@ private void writeExpandedListColumns(File tmp, HttpServletResponse response) th
                 for (int i = 1; i < all.size(); i++) {
                     String[] row = all.get(i);
                     System.arraycopy(row, 0, newRow, 0, row.length - 2);
+                    for (int j = row.length - 2; j < newRow.length; j++) {
+                        newRow[j] = "";
+                    }
 
                     if (StringUtils.isNotEmpty(row[invasiveColumn])) {
                         String[] values = row[invasiveColumn].split("\\|");
                         for (String v : values) {
                             // find column
                             for (int j = header.length - 2; j < newHeader.length; j++) {
-                                if (newHeader[j].equals(v)) {
+                                if (newHeader[j].equals(v.trim())) {
                                     newRow[j] = "Y";
                                 }
                             }
@@ -1069,11 +1072,11 @@ private void writeExpandedListColumns(File tmp, HttpServletResponse response) th
                         String[] values = row[conservationColumn].split("\\|");
                         for (String v : values) {
                             // column name
-                            String name = v.replaceAll(": [^:]*$", "");
+                            String name = v.replaceAll(": [^:]*$", "").trim();
                             // find column
                             for (int j = header.length - 2; j < newHeader.length; j++) {
                                 if (newHeader[j].equals(name)) {
-                                    newRow[j] = v.replace(name + ": ", "");
+                                    newRow[j] = v.replace(name + ": ", "").trim();
                                 }
                             }
                         }