Release 5.2.3

AtlasOfLivingAustralia · Aug 13, 2024 · f233db3 · f233db3
2 parents 29d216b + 9826382
commit f233db3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    version "5.2.2"
+    version "5.2.3"
     group "au.org.ala"
 }
 

diff --git a/grails-app/controllers/au/org/ala/specieslist/EditorController.groovy b/grails-app/controllers/au/org/ala/specieslist/EditorController.groovy
@@ -165,7 +165,6 @@ class EditorController {
         if (sli) {
             // check for changed values
             def keys = SpeciesListKVP.executeQuery("select distinct key from SpeciesListKVP where dataResourceUid= :dataResourceUid", [dataResourceUid: sli.dataResourceUid])
-            def kvpRemoveList = [] as Set
             def changed = false
 
             keys.each { key ->
@@ -179,7 +178,6 @@ class EditorController {
                     if (kvp) {
                         // old value was not empty - remove from this SLI
                         sli.removeFromKvpValues(kvp)
-                        kvpRemoveList.add(kvp)
                         sl.lastUploaded = new Date()
                     }
 
@@ -203,12 +201,6 @@ class EditorController {
                 }
             }
 
-            // remove KVP items that have changed (need to do this separately to avoid java.util.ConcurrentModificationException)
-            kvpRemoveList.each {
-                log.debug "Removing outdated kvp value: ${it}"
-                it.delete()
-            }
-
             //check if name information has changed
             if (params.rawScientificName.trim() != sli.rawScientificName.trim()) {
                 log.debug "rawScientificName is different: " + params.rawScientificName + " VS " + sli.rawScientificName

diff --git a/grails-app/services/au/org/ala/specieslist/HelperService.groovy b/grails-app/services/au/org/ala/specieslist/HelperService.groovy
@@ -953,6 +953,14 @@ class HelperService {
             scrollableResults.close()
             String msg = "${listDRId} [ ${totalRows} ] completed, time cost : ${TimeCategory.minus(new Date(), startProcessing)}"
             log.info(msg)
+
+            SpeciesList speciesListToUpdate = session.get(SpeciesList.class, speciesList.id)
+            if (speciesListToUpdate != null) {
+                speciesListToUpdate.lastMatched = new Date();
+                session.update(speciesListToUpdate)
+                session.flush()
+            }
+
             message = [status: 0, message: msg]
         } catch (Exception e) {
             session.getTransaction().rollback()

diff --git a/grails-app/views/speciesListItem/list.gsp b/grails-app/views/speciesListItem/list.gsp
@@ -1035,7 +1035,7 @@
                                         </div>
                                     </td>
                                     <td class="rawScientificName">
-                                        <g:if test="${fieldValue(bean: result, field: "rawScientificName") ==~ /.*((http|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-]))*/}">
+                                        <g:if test="${fieldValue(bean: result, field: 'rawScientificName') ==~ /.*((http|https):\/\/([\w_-]+(?:(?:\.[\w_-]+)+))([\w.,@?^=%&:\/~+#-]*[\w@?^=%&\/~+#-])*)/}">
                                             <a href="${fieldValue(bean: result, field: "rawScientificName")}" target="_blank">${fieldValue(bean: result, field: "rawScientificName")}</a>
                                         </g:if>
                                         <g:else>