litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
ryounes 2011-04-27 19:37:51 +00:00
parent a175951431
commit 98d79b3072
3 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
productMods/WEB-INF/web.xml
View file

@ -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>

9
themes/wilma/templates/identity.ftl
View file

@ -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">

8
themes/wilma/templates/page-home.ftl
View file

@ -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">