[Carrot2-cvs] carrot2/components/controllers/carrot2-web-controller/web index.jsp,1.1.1.1,1.2 largeInputSearch.jsp,1.1.1.1,1.2 search.jsp,1.1.1.1,1.2

[<daw...@us...>]

Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web
In directory sc8-pr-cvs1:/tmp/cvs-serv16052/web

Modified Files:
	index.jsp largeInputSearch.jsp search.jsp 
Log Message:
Verbatim queries are no longer preserved in session and thus don't cause
        weird errors when serialized.


Index: index.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/index.jsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** index.jsp	19 Sep 2003 10:16:02 -0000	1.1.1.1
--- index.jsp	8 Oct 2003 12:33:14 -0000	1.2
***************
*** 1,11 ****
! <%@page contentType="text/html; charset=UTF-8" %>
  
  <%@include file="jsp-tmpl/prolog-base.txt" %>
  
! <jsp:useBean id="queryBean" scope="session" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%
      if (!queryBean.isInitialized())
          queryBean.initialize(application);
  
      // calculate query params.
--- 1,19 ----
! <%@page contentType="text/html; charset=UTF-8" 
!         errorPage="/error.jsp"
! %>
  
  <%@include file="jsp-tmpl/prolog-base.txt" %>
  
! <jsp:useBean id="queryBean" scope="request" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%
      if (!queryBean.isInitialized())
          queryBean.initialize(application);
+ 
+ 	String qry = queryBean.getQuery();
+ 	if (qry.length() > 1000) {
+ 		// assume it was a verbatim query and forget it.
+ 		queryBean.setQuery("");
+ 	}
  
      // calculate query params.

Index: largeInputSearch.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/largeInputSearch.jsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** largeInputSearch.jsp	19 Sep 2003 10:16:02 -0000	1.1.1.1
--- largeInputSearch.jsp	8 Oct 2003 12:33:14 -0000	1.2
***************
*** 8,13 ****
  <%@include file="jsp-tmpl/prolog.txt" %>
  
! <!-- ### Initialize query bean (session scope) ### -->
! <jsp:useBean id="queryBean" scope="session" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%
--- 8,13 ----
  <%@include file="jsp-tmpl/prolog.txt" %>
  
! <!-- ### Initialize query bean (request scope) ### -->
! <jsp:useBean id="queryBean" scope="request" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%

Index: search.jsp
===================================================================
RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/search.jsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** search.jsp	19 Sep 2003 10:16:02 -0000	1.1.1.1
--- search.jsp	8 Oct 2003 12:33:14 -0000	1.2
***************
*** 8,13 ****
  <%@include file="jsp-tmpl/prolog.txt" %>
  
! <!-- ### Initialize query bean (session scope) ### -->
! <jsp:useBean id="queryBean" scope="session" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%
--- 8,13 ----
  <%@include file="jsp-tmpl/prolog.txt" %>
  
! <!-- ### Initialize query bean (request scope) ### -->
! <jsp:useBean id="queryBean" scope="request" class="com.dawidweiss.carrot.controller.carrot2.struts.forms.QueryForm" />
  <jsp:setProperty name="queryBean" property="*" />
  <%