From 98d79b3072eea189e95058bec34c0cc913bd1062 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 27 Apr 2011 19:37:51 +0000
Subject: [PATCH] NIHVIVO-2458 Initial draft of a solr PagedSearchController.
 Updates to web.xml are commented out for now. Remove portal and flag fields
 from search form in Freemarker templates.

---
 productMods/WEB-INF/web.xml          | 15 ++++++++++++++-
 themes/wilma/templates/identity.ftl  |  9 ---------
 themes/wilma/templates/page-home.ftl |  8 --------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index f02b7186..85283cb7 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -145,7 +145,14 @@
   <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup </listener-class>
   </listener>
-
+  <!--
+  <listener>
+    <listener-class>
+      edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup
+    </listener-class>
+  </listener>
+  -->
+  
   <!--  vivo specific, must appear before other policies -->
   <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.VivoPolicySetup</listener-class>
@@ -980,6 +987,12 @@
     <servlet-name>SearchController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
   </servlet>
+  <!--
+  <servlet>
+    <servlet-name>SearchController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrPagedSearchController</servlet-class>
+  </servlet>
+  -->
   <servlet-mapping>
     <servlet-name>SearchController</servlet-name>
     <url-pattern>/search</url-pattern>
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index d8afc39a..16847e26 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -33,15 +33,6 @@
             <legend>Search form</legend>
             
             <form id="search-form" action="${urls.search}" name="search" role="search"> 
-                <#if user.showFlag1SearchField>
-                    <select id="search-form-modifier" name="flag1" class="form-item" >
-                        <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
-                        <option value="${portalId}">${siteTagline!}</option>
-                    </select>
-                <#else>
-                    <input type="hidden" name="flag1" value="${portalId}" /> 
-                </#if> 
-                
                 <div id="search-field">
                     <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
                     <input type="submit" value="Search" class="search">
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index d3591271..4cdd0820 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -26,14 +26,6 @@
                     <fieldset>
                         <legend>Search form</legend>
                         <form id="search-home-vivo" action="${urls.search}" method="post" name="search-home" role="search">
-                            <#if user.showFlag1SearchField>
-                                <select id="search-form-modifier" name="flag1" class="form-item" >
-                                    <option value="nofiltering" selected="selected">entire database (${user.loginName})</option>
-                                    <option value="${portalId}">${siteTagline!}</option>
-                                </select>
-                            <#else>
-                                <input type="hidden" name="flag1" value="${portalId}" />
-                           </#if> 
                             <div id="search-home-field">
                                 <input type="text" name="querytext" class="search-home-vivo" value="${querytext!}" />
                                 <input type="submit" value="Search" class="search">