From 5b1f2b5c8412ece1f05f3d57e575702395e18d17 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 11 May 2011 16:17:39 +0000
Subject: [PATCH 1/4] A branch for Deepak and Anup's work on search relevance.


From 6150e68542c341c66054dd32dc3ef5b533b895c0 Mon Sep 17 00:00:00 2001
From: anupsawant <anupsawant@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 20 May 2011 19:02:34 +0000
Subject: [PATCH 2/4] made changes to web.xml to comment out
 pagesearchcontroller and to use solrpagesearchcontroller

---
 productMods/WEB-INF/web.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 7c859b9e..7e162a38 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -920,17 +920,18 @@
     <servlet-name>EntityURLController</servlet-name>
     <url-pattern>/entityurl/*</url-pattern>
   </servlet-mapping>
-  
+  <!--  
   <servlet>
     <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>

From 8b6cc3e5b01bf9a8d48c04093211782175da8236 Mon Sep 17 00:00:00 2001
From: anupsawant <anupsawant@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 24 May 2011 18:30:10 +0000
Subject: [PATCH 3/4]

---
 productMods/WEB-INF/web.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index f339ed76..38e093ca 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -143,11 +143,13 @@
     </listener-class>
   </listener>
 
-  <!-- The Lucene index uses a "public" filter, so the PropertyRestrictionPolicyHelper must already be set up. 
-  <listener>
+  <!-- The Lucene index uses a "public" filter, so the PropertyRestrictionPolicyHelper must already be set up. -->
+ <!-- 
+ <listener>
     <listener-class> edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup </listener-class>
-  </listener> -->
-  <!-- -->
+  </listener> 
+   -->
+  
   <listener>
     <listener-class>
       edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup

From 96cbaed66cd72460d350dd41f69322c9eb374974 Mon Sep 17 00:00:00 2001
From: anupsawant <anupsawant@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 24 May 2011 19:36:59 +0000
Subject: [PATCH 4/4]

---
 productMods/WEB-INF/web.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 6d3ce281..35c808e0 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -900,17 +900,17 @@
     <servlet-name>ObjectPropertyStatementListingController</servlet-name>
     <url-pattern>/listObjectPropertyStatements</url-pattern>
   </servlet-mapping>
-  
+  <!-- 
   <servlet>
     <servlet-name>IndividualListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController</servlet-class>
   </servlet>
-  <!-- 
+   -->
     <servlet>
     <servlet-name>IndividualListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController</servlet-class>
     </servlet>
-  -->
+ 
   <servlet-mapping>
     <servlet-name>IndividualListController</servlet-name>
     <url-pattern>/individuallist</url-pattern>
@@ -960,17 +960,17 @@
     <servlet-name>SearchController</servlet-name>
     <url-pattern>/searchcontroller</url-pattern>
   </servlet-mapping>
-  
+  <!-- 
   <servlet>
     <servlet-name>AutocompleteController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController</servlet-class>
   </servlet>
-  <!--
+  -->
   <servlet>
     <servlet-name>AutocompleteController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrAutocompleteController</servlet-class>
   </servlet>
-  -->
+ 
   <servlet-mapping>
     <servlet-name>AutocompleteController</servlet-name>
     <url-pattern>/autocomplete</url-pattern>