793: Migrate search interface

Task-Url: https://minfba.de.dariah.eu/mantisbt/view.php?id=793

search/incl/extended_options.jsp

@@ -9,7 +9,17 @@
 			<label class="control-label" for="schemaId"><s:message code="~eu.dariah.de.minfba.search.options.structures" /></label>
 			<select class="form-control" id="schemaId" name="schemaId">
 				<c:forEach items="${schemas}" var="s">
-					<option value="${s.schemaId}" <c:if test="${s.schemaId==query.schemaId}">selected="selected"</c:if>>
+					<c:choose>
+						<c:when test="${s.schemaId==query.schemaId}">
+							<c:set var="selected">selected="selected"</c:set>
+						</c:when>
+						<c:otherwise>
+							<c:set var="selected"></c:set>
+						</c:otherwise>
+					</c:choose>
+				
+					
+					<option ${selected} value="${s.schemaId}">
 						${s.label}
 					</option>
 			    </c:forEach>								

search/incl/incl_facet.jsp

@@ -13,7 +13,15 @@
 			<option value="_all">ANY</option>
 			<option disabled="disabled">-------------------------------------</option>
 			<c:forEach items="${availableFacets}" var="availFacet">
-				<option <c:if test="${availFacet.elementId==facet.elementId}">selected="selected"</c:if> value="${availFacet.elementId}">${availFacet.displayName}</option>
+				<c:choose>
+					<c:when test="${availFacet.elementId==facet.elementId">
+						<c:set var="selected">selected="selected"</c:set>
+					</c:when>
+					<c:otherwise>
+						<c:set var="selected"></c:set>
+					</c:otherwise>
+				</c:choose>
+				<option ${selected} value="${availFacet.elementId}">${availFacet.displayName}</option>
 			</c:forEach>
 		</select>
 	</div>