Author: ssmiweve
Date: 2008-06-05 11:07:26 +0200 (Thu, 05 Jun 2008)
New Revision: 6671

Modified:
   
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
   
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
Log:
Issue SKER4763:  (Is it possible to add more information to the <boomerang> 
log-entries?)

Modified: 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
===================================================================
--- 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
  2008-06-04 21:48:01 UTC (rev 6670)
+++ 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java
  2008-06-05 09:07:26 UTC (rev 6671)
@@ -95,15 +95,17 @@
                 final String destination = url.substring(
                         url.indexOf("/", url.indexOf(CEREMONIAL) + 
CEREMONIAL.length() + 1) + 1);
 
+                final Map<String,String> entrails = new 
HashMap<String,String>();
+
                 // request attribute to keep
-//SKER4763                entrails.put("referer", req.getHeader("Referer"));
-//                entrails.put("method", req.getMethod());
-//                entrails.put("ipaddress", req.getRemoteAddr());
-//                entrails.put("user-agent", req.getHeader("User-Agent"));
-//                entrails.put("user-id", SearchServlet.getCookieValue(req, 
"SesamID"));
-//                entrails.put("user", SearchServlet.getCookieValue(req, 
"SesamUser"));
+                entrails.put("referer", req.getHeader("Referer"));
+                entrails.put("method", req.getMethod());
+                entrails.put("ipaddress", req.getRemoteAddr());
+                entrails.put("user-agent", req.getHeader("User-Agent"));
+                entrails.put("user-id", SearchServlet.getCookieValue(req, 
"SesamID"));
+                entrails.put("user", SearchServlet.getCookieValue(req, 
"SesamUser"));
+
                 // the grub details to add
-                final Map<String,String> entrails = new 
HashMap<String,String>();
                 if(0 < grub.length()){
                     final StringTokenizer tokeniser = new 
StringTokenizer(grub, ";");
                     while(tokeniser.hasMoreTokens()){

Modified: 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java
===================================================================
--- 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java 
    2008-06-04 21:48:01 UTC (rev 6670)
+++ 
branches/2.17/war/src/main/java/no/sesat/search/http/servlet/SearchServlet.java 
    2008-06-05 09:07:26 UTC (rev 6671)
@@ -505,7 +505,7 @@
     }
 
     // probably apache commons could simplify this // duplicated in 
SiteLocatorFilter
-    private static String getCookieValue(final HttpServletRequest request, 
final String cookieName){
+    static String getCookieValue(final HttpServletRequest request, final 
String cookieName){
 
         String value = "";
         // Look in attributes (it could have already been updated this request)

_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits

Reply via email to