Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 89377 invoked from network); 13 May 2008 08:39:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 May 2008 08:39:26 -0000 Received: (qmail 12546 invoked by uid 500); 13 May 2008 08:39:27 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 12517 invoked by uid 500); 13 May 2008 08:39:27 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 12496 invoked by uid 99); 13 May 2008 08:39:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 May 2008 01:39:27 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 May 2008 08:38:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A404423889C4; Tue, 13 May 2008 01:39:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r655780 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/webapp: populate.jsp search.jsp swr.jsp Date: Tue, 13 May 2008 08:39:04 -0000 To: commits@jackrabbit.apache.org From: mreutegg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080513083904.A404423889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mreutegg Date: Tue May 13 01:39:04 2008 New Revision: 655780 URL: http://svn.apache.org/viewvc?rev=655780&view=rev Log: JCR-1596: search.jsp doesn't handle utf-8 parameters correctly Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp?rev=655780&r1=655779&r2=655780&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/populate.jsp Tue May 13 01:39:04 2008 @@ -57,6 +57,9 @@ } try { String seedWord = request.getParameter("seed"); + if (seedWord != null) { + seedWord = new String(seedWord.getBytes("ISO-8859-1"), "UTF-8"); + } int numDocs = 0; List filetypes = new ArrayList(); if (request.getParameter("num") != null) { @@ -404,4 +407,4 @@ } } } -%> \ No newline at end of file +%> Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp?rev=655780&r1=655779&r2=655780&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/search.jsp Tue May 13 01:39:04 2008 @@ -49,9 +49,11 @@ String q = request.getParameter("q"); if (q == null) { q = ""; + } else { + q = new String(q.getBytes("ISO-8859-1"), "UTF-8"); } if (request.getParameter("as_q") != null) { - q += " " + request.getParameter("as_q"); + q += " " + new String(request.getParameter("as_q").getBytes("ISO-8859-1"), "UTF-8"); } String executedIn = ""; String queryTerms = ""; Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp?rev=655780&r1=655779&r2=655780&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/swr.jsp Tue May 13 01:39:04 2008 @@ -31,7 +31,7 @@ return; } try { - String q = request.getParameter("q"); + String q = new String(request.getParameter("q").getBytes("ISO-8859-1"), "UTF-8"); String swrnum = request.getParameter("swrnum"); String numResults = null; try {