Refactoring: rename duplicated Util classes

[jabaws.git] / webservices / compbio / ws / server / GAUtils.java

diff --git a/webservices/compbio/ws/server/GAUtils.java b/webservices/compbio/ws/server/GAUtils.java
index 53acc88..3bec5c7 100644 (file)
--- a/webservices/compbio/ws/server/GAUtils.java
+++ b/webservices/compbio/ws/server/GAUtils.java
@@ -24,8 +24,7 @@ public class GAUtils {
        // compbio.dundee.ac.uk GA tracker\r
        private static AnalyticsConfigData config = new AnalyticsConfigData("UA-5356328-1");\r
 \r
-       private static GoogleAnalyticsTracker TRACKER = new GoogleAnalyticsTracker(\r
-                       config);\r
+       private static GoogleAnalyticsTracker TRACKER = new GoogleAnalyticsTracker(config);\r
 \r
        static final boolean IS_GA_ENABLED = isGoogleAnalyticsEnabled();\r
 \r
@@ -73,9 +72,19 @@ public class GAUtils {
                } else {\r
                        service_name = service.toString();\r
                }\r
-               TRACKER.trackPageViewFromReferrer("JABAWS/2.0/" + service_name,\r
-                               service_name, "http://www.compbio.dundee.ac.uk",\r
-                               SERVER_ADDRESS, VERSION_TYPE);\r
+               TRACKER.trackPageViewFromReferrer("JABAWS/2.0/" + service_name, service_name, "http://www.compbio.dundee.ac.uk", SERVER_ADDRESS, VERSION_TYPE);\r
                TRACKER.resetSession();\r
        }\r
+\r
+       static void reportUsage(Services service,  String CLIENT_ADDRESS) {\r
+               String service_name = "UNKNOWN";\r
+               if (service == null) {\r
+                       log.warn("GA: Services was NULL!");\r
+               } else {\r
+                       service_name = service.toString();\r
+               }\r
+               TRACKER.trackPageViewFromReferrer("JABAWS/2.0/" + service_name, service_name, "http://www.compbio.dundee.ac.uk", CLIENT_ADDRESS, VERSION_TYPE);\r
+               TRACKER.resetSession();\r
+       }\r
+\r
 }\r