[Yanel-commits] rev 60306 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2011-08-30 10:17:30 +0200 (Tue, 30 Aug 2011)
New Revision: 60306

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
append all tracking information

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 08:03:36 UTC (rev 60305)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-08-30 08:17:30 UTC (rev 60306)
@@ -2810,6 +2810,7 @@
         if (trackInfo != null) {
             Element trackInfoElem = doc.createElementNS(NAMESPACE, "tracking-info");
             doc.getDocumentElement().appendChild(trackInfoElem);
+
             String[] trackingTags = trackInfo.getTags();
             if (trackingTags != null && trackingTags.length > 0) {
                 Element interestsElem = doc.createElementNS(NAMESPACE, "interests");
@@ -2820,25 +2821,35 @@
                     interestsElem.appendChild(interestElem);
                 }
             } else {
-                //accessLogMessage = AccessLog.getLogMessage(request, response, realm.getID(), tags);
+                Element noInterestsElem = doc.createElementNS(NAMESPACE, "no-interests-yet");
+                trackInfoElem.appendChild(noInterestsElem);
             }
 
-                String pageType = trackInfo.getPageType();
-                if (pageType != null) {
-                    //accessLogMessage = accessLogMessage + AccessLog.encodeLogField("pt", pageType);
-                }
+            String pageType = trackInfo.getPageType();
+            if (pageType != null) {
+                Element pageTypeElem = doc.createElementNS(NAMESPACE, "page-type");
+                pageTypeElem.appendChild(doc.createTextNode(pageType));
+                trackInfoElem.appendChild(pageTypeElem);
+            }
 
-                String requestAction = trackInfo.getRequestAction();
-                if (requestAction != null) {
-                    //accessLogMessage = accessLogMessage + AccessLog.encodeLogField("ra", requestAction);
-                }
+            String requestAction = trackInfo.getRequestAction();
+            if (requestAction != null) {
+                Element requestActionElem = doc.createElementNS(NAMESPACE, "request-action");
+                requestActionElem.appendChild(doc.createTextNode(requestAction));
+                trackInfoElem.appendChild(requestActionElem);
+            }
 
-                HashMap<String, String> customFields = trackInfo.getCustomFields();
-                if (customFields != null) {
-                    for (java.util.Map.Entry field : customFields.entrySet()) {
-                        //accessLogMessage = accessLogMessage + AccessLog.encodeLogField((String) field.getKey(), (String) field.getValue());
-                    }
+            HashMap<String, String> customFields = trackInfo.getCustomFields();
+            if (customFields != null) {
+                Element customFieldsElem = doc.createElementNS(NAMESPACE, "custom-fields");
+                trackInfoElem.appendChild(customFieldsElem);
+                for (java.util.Map.Entry field : customFields.entrySet()) {
+                    Element fieldElem = doc.createElementNS(NAMESPACE, "field");
+                    fieldElem.setAttribute("name", (String) field.getKey());
+                    fieldElem.setAttribute("value", (String) field.getValue());
+                    customFieldsElem.appendChild(fieldElem);
                 }
+            }
         } else {
             log.debug("No tracking information.");
             Element noTrackInfoElem = doc.createElementNS(NAMESPACE, "no-tracking-information");