Author: sshafroi Date: 2008-07-07 10:35:57 +0200 (Mon, 07 Jul 2008) New Revision: 6725
Modified: trunk/ trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java Log: Merged revisions 6715-6718,6721-6724 via svnmerge from http://sesat.no/svn/sesat-kernel/branches/2.17 ........ r6724 | sshafroi | 2008-07-07 10:31:14 +0200 (Mon, 07 Jul 2008) | 15 lines Change the syntax of XML written for the logparser. Instead of using the parameter's key, as the name of the tag, we now use the fixed tag <parameter> for this. The key and value are added as parameters inside the parameter tag. So we have gone from this: <1_wonkey_name>123</1_wonkey_name> to <parameter key="1_wonkey_name" value="123" /> Which is much safer. ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715,6719,6720 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 + /branches/2.10:1-4690,4692-4745 /branches/2.11:1-4933 /branches/2.12:1-5051,5053-5106 /branches/2.13:1-5378 /branches/2.14:1-5508 /branches/2.15:1-5995 /branches/2.16:1-6499 /branches/2.17:1-6713,6715-6724 /branches/2.6:1-3877 /branches/2.7:1-4160 /branches/2.8:1-4446 /branches/2.9:1-4626 /branches/MAP_SEARCHv2:1-4544 Modified: trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java =================================================================== --- trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java 2008-07-07 08:31:14 UTC (rev 6724) +++ trunk/war/src/main/java/no/sesat/search/http/servlet/BoomerangServlet.java 2008-07-07 08:35:57 UTC (rev 6725) @@ -155,13 +155,10 @@ ? ((StringDataObject) params.get(key)).getXmlEscaped() : StringEscapeUtils.escapeXml((String) params.get(key)); - // it's critical for the logparser that we write valid xml final String keyEscaped = StringEscapeUtils.escapeXml(URLDecoder.decode(key, "UTF-8")); - if (!keyEscaped.contains("%")) { - bob.append('<' + keyEscaped + '>' + value + "</" + keyEscaped + '>'); - }else{ - bob.append("<doubled-url-encoded-tag-ignored-here/>"); - } + + bob.append("<parameter key=\"" + keyEscaped + "\" value=\"" + value + "\"/>"); + }catch (UnsupportedEncodingException ex) { LOG.error("Failed to kangerooGrub " + key, ex); } _______________________________________________ Kernel-commits mailing list [email protected] http://sesat.no/mailman/listinfo/kernel-commits
