You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2008/07/12 16:59:12 UTC

svn commit: r676183 - in /lucene/solr/trunk: CHANGES.txt src/webapp/web/admin/analysis.jsp src/webapp/web/admin/form.jsp src/webapp/web/admin/header.jsp src/webapp/web/admin/index.jsp

Author: yonik
Date: Sat Jul 12 07:59:12 2008
New Revision: 676183

URL: http://svn.apache.org/viewvc?rev=676183&view=rev
Log:
SOLR-501: Fix admin/analysis.jsp UTF-8 input for some other servlet containers such as Tomcat

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/webapp/web/admin/analysis.jsp
    lucene/solr/trunk/src/webapp/web/admin/form.jsp
    lucene/solr/trunk/src/webapp/web/admin/header.jsp
    lucene/solr/trunk/src/webapp/web/admin/index.jsp

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?rev=676183&r1=676182&r2=676183&view=diff
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sat Jul 12 07:59:12 2008
@@ -471,6 +471,9 @@
 
 40. SOLR-556: multi-valued fields always highlighted in disparate snippets (Lars Kotthoff via klaas)
 
+41. SOLR-501: Fix admin/analysis.jsp UTF-8 input for some other servlet
+    containers such as Tomcat. (Hiroaki Kawai, Lars Kotthoff via yonik)
+
 Other Changes
  1. SOLR-135: Moved common classes to org.apache.solr.common and altered the
     build scripts to make two jars: apache-solr-1.3.jar and 

Modified: lucene/solr/trunk/src/webapp/web/admin/analysis.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/analysis.jsp?rev=676183&r1=676182&r2=676183&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/analysis.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/analysis.jsp Sat Jul 12 07:59:12 2008
@@ -61,7 +61,7 @@
 
 <h2>Field Analysis</h2>
 
-<form method="POST" action="analysis.jsp">
+<form method="POST" action="analysis.jsp" accept-charset="UTF-8">
 <table>
 <tr>
   <td>

Modified: lucene/solr/trunk/src/webapp/web/admin/form.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/form.jsp?rev=676183&r1=676182&r2=676183&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/form.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/form.jsp Sat Jul 12 07:59:12 2008
@@ -18,7 +18,7 @@
 <%@include file="header.jsp" %>
 
 <br clear="all">
-<form name="queryForm" method="GET" action="../select">
+<form name="queryForm" method="GET" action="../select" accept-charset="UTF-8">
 <!-- these are good defaults to have if people bookmark the resulting
      URLs, but they should not show up in the form since they are very
      output type specific.

Modified: lucene/solr/trunk/src/webapp/web/admin/header.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/header.jsp?rev=676183&r1=676182&r2=676183&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/header.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/header.jsp Sat Jul 12 07:59:12 2008
@@ -15,13 +15,17 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 --%>
+<html>
+<head>
+<%
+request.setCharacterEncoding("UTF-8");
+%>
 <%@include file="_info.jsp" %>
 <script>
 var host_name="<%= hostname %>"
 </script>
 
-<html>
-<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <link rel="stylesheet" type="text/css" href="solr-admin.css">
 <link rel="icon" href="favicon.ico" type="image/ico"></link>
 <link rel="shortcut icon" href="favicon.ico" type="image/ico"></link>

Modified: lucene/solr/trunk/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/webapp/web/admin/index.jsp?rev=676183&r1=676182&r2=676183&view=diff
==============================================================================
--- lucene/solr/trunk/src/webapp/web/admin/index.jsp (original)
+++ lucene/solr/trunk/src/webapp/web/admin/index.jsp Sat Jul 12 07:59:12 2008
@@ -106,7 +106,7 @@
   Query String:
   </td>
   <td colspan=2>
-	<form name=queryForm method="GET" action="../select/">
+	<form name=queryForm method="GET" action="../select/" accept-charset="UTF-8">
         <textarea class="std" rows="4" cols="40" name="q"><%= defaultSearch %></textarea>
         <input name="version" type="hidden" value="2.2">
 	<input name="start" type="hidden" value="0">