From eed6e5a9d9fb68f7b7835db1ae195b96b2ef57f2 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 27 Oct 2010 18:57:13 +0000
Subject: [PATCH] NIHVIVO-1287 Moved changes from PagedSearchController to
 FreemarkerPagedSearchController, since this is the active search controller
 in vivo and vitro

---
 webapp/config/web.xml                         | 12 ++++++++
 .../FreemarkerPagedSearchController.java      | 28 ++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index b3459dc4e..d01eb347d 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -945,6 +945,18 @@
     <url-pattern>/TabEntitiesController</url-pattern>
   </servlet-mapping>
 
+  <!--  NOTICE: index.jsp is mapped to TabController so that we 
+            can have the urls that use to be in the system still work even 
+              though we no longer use index.jsp           -->
+    <servlet>
+      <servlet-name>TabController</servlet-name>
+      <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
+    </servlet>
+    <servlet-mapping>
+      <servlet-name>TabController</servlet-name>
+      <url-pattern>/index.jsp</url-pattern>
+    </servlet-mapping>
+    
   <!-- <servlet>
        <servlet-name>EntityPropertyListController</servlet-name>     
        <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java
index a5bd4ff15..780640d54 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/FreemarkerPagedSearchController.java
@@ -65,6 +65,7 @@ import edu.cornell.mannlib.vitro.webapp.search.beans.VitroHighlighter;
 import edu.cornell.mannlib.vitro.webapp.search.beans.VitroQuery;
 import edu.cornell.mannlib.vitro.webapp.search.beans.VitroQueryFactory;
 import edu.cornell.mannlib.vitro.webapp.search.lucene.Entity2LuceneDoc;
+import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexFactory;
 import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneIndexer;
 import edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup;
 import edu.cornell.mannlib.vitro.webapp.search.lucene.SimpleLuceneHighlighter;
@@ -109,20 +110,6 @@ public class FreemarkerPagedSearchController extends FreemarkerHttpServlet imple
         }
     }
 
-    public void init(ServletConfig config) throws ServletException {
-        super.init(config);
-        LuceneIndexer indexer=(LuceneIndexer)getServletContext()
-        .getAttribute(LuceneIndexer.class.getName());
-        indexer.addSearcher(this);
-
-        try{
-            String indexDir = getIndexDir(getServletContext());        
-            getIndexSearcher(indexDir);
-        }catch(Exception ex){
-
-        }                                           
-    }
-
     @Override
     protected ResponseValues processRequest(VitroRequest vreq) { 
         
@@ -150,6 +137,7 @@ public class FreemarkerPagedSearchController extends FreemarkerHttpServlet imple
             }catch (Throwable e) { 
                 startIndex = 0; 
             }            
+            log.debug("startIndex is " + startIndex);
             
             int hitsPerPage = defaultHitsPerPage;
             try{ 
@@ -157,6 +145,7 @@ public class FreemarkerPagedSearchController extends FreemarkerHttpServlet imple
             } catch (Throwable e) { 
                 hitsPerPage = defaultHitsPerPage; 
             }                        
+            log.debug("hitsPerPage is " + hitsPerPage);
             
             int maxHitSize = defaultMaxSearchSize;
             if( startIndex >= defaultMaxSearchSize - hitsPerPage )
@@ -165,21 +154,20 @@ public class FreemarkerPagedSearchController extends FreemarkerHttpServlet imple
                 maxHitSize = maxHitSize * 2;
                 hitsPerPage = maxHitSize;
             }
-            
-            String indexDir = getIndexDir(getServletContext());
-            
+            log.debug("maxHitSize is " + maxHitSize);
+
             String qtxt = vreq.getParameter(VitroQuery.QUERY_PARAMETER_NAME);
             Analyzer analyzer = getAnalyzer(getServletContext());
             
             Query query = null;
             try {
-                query = getQuery(vreq, portalFlag, analyzer, indexDir, qtxt);
+                query = getQuery(vreq, portalFlag, analyzer, qtxt);
                 log.debug("query for '" + qtxt +"' is " + query.toString());
             } catch (ParseException e) {
                 return doBadQuery(portal, qtxt);
             } 
 
-            IndexSearcher searcherForRequest = getIndexSearcher(indexDir);
+            IndexSearcher searcherForRequest = LuceneIndexFactory.getIndexSearcher(getServletContext());
                                                 
             TopDocs topDocs = null;
             try{
@@ -524,7 +512,7 @@ public class FreemarkerPagedSearchController extends FreemarkerHttpServlet imple
     }
 
     private Query getQuery(VitroRequest request, PortalFlag portalState,
-                       Analyzer analyzer, String indexDir, String querystr ) throws SearchException, ParseException {
+                       Analyzer analyzer, String querystr ) throws SearchException, ParseException {
         Query query = null;
         try{
             //String querystr = request.getParameter(VitroQuery.QUERY_PARAMETER_NAME);