jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
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 GMT
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 {



Mime
View raw message