Refactor and cleanup

biodiversitydata-se · Mar 19, 2024 · 92db48c · 92db48c
1 parent 67fbc1a
commit 92db48c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 27 deletions.
diff --git a/grails-app/controllers/au/org/ala/collectory/IptController.groovy b/grails-app/controllers/au/org/ala/collectory/IptController.groovy
@@ -242,40 +242,25 @@ class IptController {
             }
 
             def iptInventory = new JsonSlurper().parse(new URL(provider.websiteUrl + "/inventory/dataset"))
-            def count = 0
-            def iptMap = [:]
             def result = []
 
-            String[] header = [
-                    "EML URL",
-                    "GUID",
-                    "Title",
-                    "Number of records in IPT",
-                    "Number of records in Atlas",
-                    "Atlas ID"
-            ]
-            result.add(header)
-
             iptInventory.registeredResources.each { item ->
-                iptMap.put(item.title, item.records)
                 //retrieve UID, and do a count from the services
                 def uid = newMap.get(item.title.toLowerCase())
+                def row= [
+                        title: item.title,
+                        eml: item.eml,
+                        gbifKey: item.gbifKey,
+                        uid: "Not registered",
+                        gbifCount: item.records,
+                        atlasCount: 0
+                ]
                 if (uid) {
                     def jsonCount = new JsonSlurper().parse(new URL(grailsApplication.config.biocacheServicesUrl + "/occurrences/search?pageSize=0&fq=data_resource_uid:" + uid))
-                    String[] row = [
-                            item.eml,
-                            item.gbifKey,
-                            item.title,
-                            item.records,
-                            jsonCount.totalRecords,
-                            uid
-                    ]
-                    result.add(row)
-                } else {
-                    String[] row = [item.eml, item.gbifKey, item.title, item.records, "0", "Not registered"]
-                    result.add(row)
+                    row.uid = uid
+                    row.atlasCount = jsonCount.totalRecords
                 }
-                count += 1
+                result.add(row)
             }
             [result: result]
         }

diff --git a/grails-app/views/ipt/syncView.gsp b/grails-app/views/ipt/syncView.gsp
@@ -1 +1,5 @@
-${result}
+<pre>
+    <g:each in="${result}" var="item">
+        ${item}
+    </g:each>
+</pre>