Merge pull request #360 from UNC-Libraries/remove-folder-facet

Removed folder facet

Author: daines

access-common/src/main/resources/META-INF/resources/jsp/util/facetList.jsp

@@ -78,17 +78,6 @@
 			</c:when>
 		</c:choose>
 		<c:if test="${not empty facetField.values}">
-			<c:if test="${facetField.name == 'ANCESTOR_PATH'}">
-				<div id="facet_field_${searchSettings.searchFieldParams[facetField.name]}_structure" class="hidden">
-					<c:if test="${not empty selectedContainer}"><c:set var="containerPath" value="/${selectedContainer.id}"/></c:if>
-					<c:url var="structureUrl" scope="page" value='structure${containerPath}/path${searchStateParameters}'>
-						<c:param name="view" value="facet"/>
-						<c:param name="queryp" value="list"/>
-						<c:param name="files" value="false"/>
-					</c:url>
-					<a href="<c:out value="${structureUrl}" />"><img src="/static/images/ajax_loader.gif"/></a>
-				</div>
-			</c:if>
 			<ul id="facet_field_<c:out value="${searchSettings.searchFieldParams[facetField.name]}_list" />" class="facets">
 				<c:forEach items="${facetField.values}" var="facetValue" varStatus="status">
 					<c:choose>

access/src/main/java/edu/unc/lib/dl/ui/controller/SearchActionController.java

@@ -111,7 +111,7 @@ public String browseCollections(Model model, HttpServletRequest request) {
 		SearchState searchState = searchRequest.getSearchState();
 		searchState.setResourceTypes(Arrays.asList(searchSettings.resourceTypeCollection));
 		searchState.setRowsPerPage(searchSettings.defaultCollectionsPerPage);
-		searchState.getFacetsToRetrieve().remove(SearchFieldKeys.PARENT_COLLECTION.name());
+		searchState.setFacetsToRetrieve(searchSettings.collectionBrowseFacetNames);
 
 		SearchResultResponse result = doSearch(searchRequest, model, request);
 		result.setSelectedContainer(null);

access/src/main/resources/search.properties

@@ -91,9 +91,9 @@ search.facet.expandedFacetsPerGroup=20
 search.facet.maxFacetsPerGroup=50
 search.facet.maxChildCounts=10000
 search.facet.countPageSize=100
-search.facet.fields=PARENT_COLLECTION,ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,DEPARTMENT_LC,LANGUAGE,SUBJECT
-search.facet.defaultSearch=PARENT_COLLECTION,ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
-search.facet.defaultCollectionBrowse=ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
+search.facet.fields=PARENT_COLLECTION,CONTENT_TYPE,DEPARTMENT,DEPARTMENT_LC,LANGUAGE,SUBJECT
+search.facet.defaultSearch=PARENT_COLLECTION,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
+search.facet.defaultCollectionBrowse=CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
 search.facet.defaultStructureBrowse=CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
 search.facet.class.ANCESTOR_PATH=CutoffFacet
 search.facet.class.CONTENT_TYPE=MultivaluedHierarchicalFacet

access/src/main/webapp/WEB-INF/jsp/searchResults.jsp

@@ -57,7 +57,6 @@
 				<c:set var="facetFields" scope="request" value="${resultResponse.facetFields}"/>
 				<c:choose>
 					<c:when test="${resultType == 'collectionBrowse'}">
-						
 						<h2>Refine your results</h2>
 						<c:import url="/jsp/util/facetList.jsp">
 							<c:param name="queryMethod">search</c:param>
@@ -66,6 +65,16 @@
 					</c:when>
 					<c:otherwise>
 						<c:set var="selectedContainer" scope="request" value="${resultResponse.selectedContainer}"/>
+						<h2>Folders</h2>
+						<div id="facet_field_path_structure" class="hidden">
+							<c:if test="${not empty resultResponse.selectedContainer}"><c:set var="containerPath" value="/${selectedContainer.id}"/></c:if>
+							<c:url var="structureUrl" scope="page" value='structure${containerPath}/path'>
+								<c:param name="view" value="facet"/>
+								<c:param name="queryp" value="list"/>
+								<c:param name="files" value="false"/>
+							</c:url>
+							<a href="<c:out value="${structureUrl}" />"><img src="/static/images/ajax_loader.gif"/></a>
+						</div>
 						<h2>Refine your search</h2>
 						<c:import url="/jsp/util/facetList.jsp">
 							<c:param name="queryMethod">search</c:param>

static/css/cdrui_styles.css

@@ -804,6 +804,10 @@ p.navigation_bar a {
 
 }
 
+#facet_field_path_structure .structure.facet .structure_content {
+	max-height: 300px;
+}
+
 .metadata table {
 	clear: both;
 	font-size: 12px;