Merge pull request #265 from AtlasOfLivingAustralia/develop

PR for release 4.1.3

Author: sughics

Diff for: grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy

@@ -375,10 +375,9 @@ class SpeciesListController {
             }
 
             if(speciesList){
-                def url = bieService.generateFieldGuide(speciesList.getDataResourceUid(), guids)
-                log.debug("THE URL:: " + url)
-                if(url)
-                    redirect(url:url)
+                def fieldguideResponse = bieService.generateFieldGuide(speciesList.getDataResourceUid(), guids, params.email)
+                if(fieldguideResponse)
+                    redirect(url: fieldguideResponse.get('statusUrl'))
                 else
                     redirect(controller: "speciesListItem", action: "list", id:params.id)
             }

Diff for: grails-app/services/au/org/ala/specieslist/BieService.groovy

@@ -17,10 +17,13 @@ package au.org.ala.specieslist
 import grails.converters.JSON
 import grails.web.JSONBuilder
 import groovyx.net.http.HTTPBuilder
+import org.apache.http.entity.ContentType
 
 class BieService {
 
     def grailsApplication
+    def webService
+    def authService
 
     def bulkLookupSpecies(list) {
         Map map = [:]
@@ -57,17 +60,14 @@ class BieService {
         }
     }
 
-    def generateFieldGuide(druid,guids){
+    def generateFieldGuide(druid,guids, email){
         def title = "The field guide for " + druid
-        def link = grailsApplication.config.grails.serverURL + "/speciesListItems/list/" + druid
+        def link = grailsApplication.config.grails.serverURL + "/speciesListItem/list/" + druid
         try {
-            def http = new HTTPBuilder(grailsApplication.config.fieldGuide.baseURL + "/generate")
+            def http = new HTTPBuilder(grailsApplication.config.fieldGuide.baseURL + "/generate" + "?email="+ email)
             http.setHeaders(['User-Agent': "${grailsApplication.config.outboundhttp.useragent}"])
-            def response = http.post(body:  createJsonForFieldGuide(title, link, guids), requestContentType:groovyx.net.http.ContentType.JSON){ resp ->
-                def responseURL = grailsApplication.config.fieldGuide.baseURL +"/guide/"+ resp.headers['fileId'].getValue()
-                log.debug(responseURL)
-                return responseURL
-            }
+            def response = http.post(body:  createJsonForFieldGuide(title, link, guids), requestContentType:ContentType.APPLICATION_JSON)
+            return response
         } catch(ex) {
             log.error("Unable to generate field guide " ,ex)
             return null

Diff for: grails-app/views/_download.gsp

@@ -78,7 +78,7 @@ ${message(code:'download.lists.text02', default:'Please provide the following de
                 e.preventDefault();
 
                 if (validateForm()) {
-                    var downloadUrl = "${request.contextPath}/speciesList/fieldGuide/${params.id}${params.toQueryString()}"
+                    var downloadUrl = "${request.contextPath}/speciesList/fieldGuide/${params.id}${params.toQueryString()}&email="+$("#email").val();
                     //alert(downloadUrl)
                     window.open(downloadUrl);
                     notifyDownloadStarted()