logger URL configurable

AtlasOfLivingAustralia · Sep 17, 2014 · 3729127 · 3729127
1 parent efafe25
commit 3729127
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/application.properties b/application.properties
@@ -4,4 +4,4 @@ app.build=163
 app.grails.version=2.3.8
 app.name=collectory
 app.servlet.version=2.5
-app.version=1.1.2-SNAPSHOT
+app.version=1.1.2
diff --git a/grails-app/views/public/show.gsp b/grails-app/views/public/show.gsp
@@ -384,7 +384,7 @@ function onLoadCallback() {
 //      $('div.learnMaps').css('display','none');
 //  }
 
-  loadDownloadStats("${instance.uid}","${instance.name}", "1002");
+  loadDownloadStats("${grailsApplication.config.loggerURL}", "${instance.uid}","${instance.name}", "1002");
 
   // records
   $.ajax({

diff --git a/grails-app/views/public/showDataProvider.gsp b/grails-app/views/public/showDataProvider.gsp
@@ -195,7 +195,7 @@
      \************************************************************/
     function onLoadCallback() {
         // stats
-        loadDownloadStats("${instance.uid}", "${instance.name}", "1002");
+        loadDownloadStats("${grailsApplication.config.loggerURL}", "${instance.uid}", "${instance.name}", "1002");
     }
 
     /************************************************************\

diff --git a/grails-app/views/public/showDataResource.gsp b/grails-app/views/public/showDataResource.gsp
@@ -358,9 +358,9 @@
     function onLoadCallback() {
       // stats
       if (${instance.resourceType == 'website'}) {
-          loadDownloadStats("${instance.uid}","${instance.name}", "2000");
+          loadDownloadStats("${grailsApplication.config.loggerURL}", "${instance.uid}","${instance.name}", "2000");
       } else if (${instance.resourceType == 'records'}) {
-          loadDownloadStats("${instance.uid}","${instance.name}", "1002");
+          loadDownloadStats("${grailsApplication.config.loggerURL}", "${instance.uid}","${instance.name}", "1002");
       }
 
       // species pages

diff --git a/grails-app/views/public/showInstitution.gsp b/grails-app/views/public/showInstitution.gsp
@@ -234,7 +234,7 @@
     function onLoadCallback() {
 
       // stats
-      loadDownloadStats("${instance.uid}","${instance.name}", "1002");
+      loadDownloadStats("${grailsApplication.config.loggerURL}", "${instance.uid}","${instance.name}", "1002");
 
       // records
       $.ajax({

diff --git a/web-app/js/collectory.js b/web-app/js/collectory.js
@@ -211,12 +211,15 @@ function contactCurator(email, firstName, uid, instUid, name) {
 /************************************************************\
  *******        LOAD DOWNLOAD STATS        *****
 \************************************************************/
-function loadDownloadStats(uid, name, eventType) {
+function loadDownloadStats(loggerServicesUrl, uid, name, eventType) {
     if (eventType == '') {
         // nothing to show
         return;
     }
-    var loggerServicesUrl = "http://logger.ala.org.au/service/";
+    if (loggerServicesUrl == ''){
+        return;
+    }
+
     var url = loggerServicesUrl + uid + "/events/" + eventType + "/counts.json";
     $.ajax({
       url: url,