Skip to content

Commit fc7029d

Browse files
committed
Removed the folder facet from collection full record page, and no longer populating in search results either, simply going straight to including the hierarchical browse
1 parent fc8cbb0 commit fc7029d

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,6 @@
7878
</c:when>
7979
</c:choose>
8080
<c:if test="${not empty facetField.values}">
81-
<c:if test="${facetField.name == 'ANCESTOR_PATH'}">
82-
<div id="facet_field_${searchSettings.searchFieldParams[facetField.name]}_structure" class="hidden">
83-
<c:if test="${not empty selectedContainer}"><c:set var="containerPath" value="/${selectedContainer.id}"/></c:if>
84-
<c:url var="structureUrl" scope="page" value='structure${containerPath}/path${searchStateParameters}'>
85-
<c:param name="view" value="facet"/>
86-
<c:param name="queryp" value="list"/>
87-
<c:param name="files" value="false"/>
88-
</c:url>
89-
<a href="<c:out value="${structureUrl}" />"><img src="/static/images/ajax_loader.gif"/></a>
90-
</div>
91-
</c:if>
9281
<ul id="facet_field_<c:out value="${searchSettings.searchFieldParams[facetField.name]}_list" />" class="facets">
9382
<c:forEach items="${facetField.values}" var="facetValue" varStatus="status">
9483
<c:choose>
@@ -130,5 +119,16 @@
130119
</c:forEach>
131120
</ul>
132121
</c:if>
122+
<c:if test="${facetField.name == 'PARENT_COLLECTION'}">
123+
<div id="facet_field_path_structure" class="hidden">
124+
<c:if test="${not empty selectedContainer}"><c:set var="containerPath" value="/${selectedContainer.id}"/></c:if>
125+
<c:url var="structureUrl" scope="page" value='structure${containerPath}/path${searchStateParameters}'>
126+
<c:param name="view" value="facet"/>
127+
<c:param name="queryp" value="list"/>
128+
<c:param name="files" value="false"/>
129+
</c:url>
130+
<a href="<c:out value="${structureUrl}" />"><img src="/static/images/ajax_loader.gif"/></a>
131+
</div>
132+
</c:if>
133133
</div>
134134
</c:forEach>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public String browseCollections(Model model, HttpServletRequest request) {
111111
SearchState searchState = searchRequest.getSearchState();
112112
searchState.setResourceTypes(Arrays.asList(searchSettings.resourceTypeCollection));
113113
searchState.setRowsPerPage(searchSettings.defaultCollectionsPerPage);
114-
searchState.getFacetsToRetrieve().remove(SearchFieldKeys.PARENT_COLLECTION.name());
114+
searchState.setFacetsToRetrieve(searchSettings.collectionBrowseFacetNames);
115115

116116
SearchResultResponse result = doSearch(searchRequest, model, request);
117117
result.setSelectedContainer(null);

access/src/main/resources/search.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ search.facet.expandedFacetsPerGroup=20
9191
search.facet.maxFacetsPerGroup=50
9292
search.facet.maxChildCounts=10000
9393
search.facet.countPageSize=100
94-
search.facet.fields=PARENT_COLLECTION,ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,DEPARTMENT_LC,LANGUAGE,SUBJECT
95-
search.facet.defaultSearch=PARENT_COLLECTION,ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
96-
search.facet.defaultCollectionBrowse=ANCESTOR_PATH,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
94+
search.facet.fields=PARENT_COLLECTION,CONTENT_TYPE,DEPARTMENT,DEPARTMENT_LC,LANGUAGE,SUBJECT
95+
search.facet.defaultSearch=PARENT_COLLECTION,CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
96+
search.facet.defaultCollectionBrowse=CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
9797
search.facet.defaultStructureBrowse=CONTENT_TYPE,DEPARTMENT,LANGUAGE,SUBJECT
9898
search.facet.class.ANCESTOR_PATH=CutoffFacet
9999
search.facet.class.CONTENT_TYPE=MultivaluedHierarchicalFacet

0 commit comments

Comments
 (0)