From e3273c7146e4436810827dfa926b4b966ad85d2f Mon Sep 17 00:00:00 2001
From: kimong <kim.ong@ngc.com>
Date: Thu, 27 Mar 2014 06:53:35 -0400
Subject: [PATCH] [GF#33070] Make "Contains" the default on all searches.

---
 .../java/gov/nih/nci/evs/browser/bean/UserSessionBean.java    | 4 +++-
 software/ncimbrowser/web/pages/advanced_search.jsp            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/UserSessionBean.java b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/UserSessionBean.java
index 9bcff47c..3a42a428 100644
--- a/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/UserSessionBean.java
+++ b/software/ncimbrowser/src/java/gov/nih/nci/evs/browser/bean/UserSessionBean.java
@@ -180,7 +180,9 @@ public String advancedSearchAction() {
 
         String searchTarget = HTTPUtils.cleanXSS((String) request.getParameter("searchTarget"));
 
-        String matchText = HTTPUtils.cleanXSS((String)  request.getParameter("matchText"));
+        //String matchText = HTTPUtils.cleanXSS((String)  request.getParameter("matchText"));
+        String matchText = HTTPUtils.cleanXSS((String)  request.getParameter("adv_matchText"));
+
         if (matchText == null || matchText.length() == 0) {
             String message = "Please enter a search string.";
             // request.getSession().setAttribute("message", message);
diff --git a/software/ncimbrowser/web/pages/advanced_search.jsp b/software/ncimbrowser/web/pages/advanced_search.jsp
index 54fe922a..253bda0c 100644
--- a/software/ncimbrowser/web/pages/advanced_search.jsp
+++ b/software/ncimbrowser/web/pages/advanced_search.jsp
@@ -327,7 +327,7 @@
 
                 <table>
                   <tr><td>
-    <input CLASS="searchbox-input" id="matchText" name="matchText" value="<%=HTTPUtils.cleanXSS(search_string)%>" onFocus="active=true"
+    <input CLASS="searchbox-input" id="matchText" name="adv_matchText" value="<%=HTTPUtils.cleanXSS(search_string)%>" onFocus="active=true"
         onBlur="active=false"  onkeypress="return submitEnter('advancedSearchForm:adv_search',event)"  />
 
                     <h:commandButton id="adv_search" value="Search" action="#{userSessionBean.advancedSearchAction}"