diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 794bb35f..f4a89d91 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -83,8 +83,8 @@ public class NlibSearchController extends NlibCommonController { * @param req * @return */ - @RequestMapping("/collection/listItems.do") - public String listItems( + @RequestMapping("/search/searchList.do") + public String searchList( HttpServletRequest req , Authentication authentication , @RequestParam Map paramMap @@ -97,7 +97,7 @@ public class NlibSearchController extends NlibCommonController { String pageIndex = StringUtil.getString(paramMap.get("pageIndex"), "1"); String pageSize = StringUtil.getString(paramMap.get("pageSize") , DEFUALT_PAGE_SIZE); List vo = new ArrayList(); - List list = new ArrayList(); + List operList = new ArrayList(); // 페이징 사이즈 코드 목록 조회 (DB방식으로 변경 2021.08.06 KNKIM) List> pageSizeCodes = codeService.listCodes("PAGE_SIZE_OPTION"); @@ -119,15 +119,13 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("pageSizeCodes", pageSizeCodes); model.addAttribute("masterType", masterType); model.addAttribute("dtlsType", dtlsType); - model.addAttribute("masterClsf", clsf); - model.addAttribute("dtlsClsf", clsf); + model.addAttribute("firstCategoryInfo", clsf); + model.addAttribute("secondCategoryInfo", clsf); /*model.addAttribute("orgList",vo);*/ //검색엔진 try{ - searchVO.setRealQuery("한복"); - searchVO.setQuery("한복"); searchVO.setCollection("reference_Coll"); // 검색관련 서버 설정 String searchIp = nlibProperty.getString("search.searchIp"); @@ -285,15 +283,13 @@ public class NlibSearchController extends NlibCommonController { { /*collReferecne.getSearchResultList().get(i).get("MASTER_ID");*/ colVO.setMasterId("UR-91F3EB466E2743C48CC264BAC8CC573B"); - list.add(colVO); + operList.add(colVO); } - System.out.println(list.size()); - System.out.println(list.get(0).getMasterId()); - System.out.println(list.get(1).getMasterId()); - System.out.println(list.get(2).getMasterId()); - System.out.println(list.get(3).getMasterId()); - list = collectionService.setDetailInfoForList(list); + //열람,대출 가능 상태 + operList = collectionService.setDetailInfoForList(operList); + + model.addAttribute("operList", operList); // 경로 CmmUtil.setNfsPathModelMap(request,model); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index f67b87a3..77c2a9e7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -82,6 +82,13 @@ window.onload = function() { }; // window.onload + +function fnFilterSch(){ + $("input[name=query]").val($("#searchKeyword").val()); + document.referencelistForm.action="${pageContext.request.contextPath}/search/searchList.do"; + document.referencelistForm.submit(); +} + <%//검색필터 서브메뉴 보이기%> function fn_show_sub(subId,subClass){ if($("#" + subId).css("display") == "none") @@ -169,7 +176,44 @@ function fn_search_article(pageIndex) {

${pageTitle }

- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="btnSearch" onclick="fnFilterSch();" value="검색" />
검색결과 안내
- '${searchVO.realQuery}'에 대한 검색결과는 총 건 입니다. + + + '${searchVO.query}'에 대한 검색결과는 총 건 입니다. + + + 총 건 + +
@@ -233,29 +285,20 @@ function fn_search_article(pageIndex) { varStatus="fcStatus">
  • class="showMoreType" style="display:none;" > -
    on"> +
    on">
    - checked="checked" /> + checked="checked" /> +
      - -
    • checked="checked"/>
    • -
      + +
    • checked="checked"/>
    • +
  • diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/selectItemInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/selectItemInfo.jsp index 258cbde6..a82e735d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/selectItemInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/selectItemInfo.jsp @@ -42,7 +42,7 @@ // 목록 보기로 이동 function fn_list() { - $("#articleForm").attr("action", "${pageContext.request.contextPath}/collection/listItems.do"); + $("#articleForm").attr("action", "${pageContext.request.contextPath}/search/searchList.do"); $("#articleForm").submit(); } @@ -63,7 +63,7 @@ function fn_list() {

    ${pageTitle }

    diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index b19a97fa..7b2d5ef8 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -3,36 +3,29 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>