diff --git a/.classpath b/.classpath index 9778664e..805d53df 100644 --- a/.classpath +++ b/.classpath @@ -13,16 +13,18 @@ + + - + diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index f0efd055..ab4146fb 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -68,8 +68,10 @@ public class NlibSearchServiceImpl implements NlibSearchService{ @Value("#{properties['search.protocol']}") private String SEARCH_PROTOCOL; - public NlibSearchVO getSearch(NlibSearchVO searchVO) throws Exception { - try { + public NlibSearchVO getSearch(NlibSearchVO searchVO) throws Exception + { + try + { //검색엔진 페이지 셋팅 searchVO.setListCount(Integer.toString(searchVO.getPageSize())); searchVO.setStartCount(Integer.toString(searchVO.getPageIndex())); @@ -113,7 +115,8 @@ public class NlibSearchServiceImpl implements NlibSearchService{ allParameters.forEach((k, v) -> log.debug("allParams > " + k + " : " + v)); HttpEntity> requestEntity = new HttpEntity(parameters, headers); HttpEntity> allRequestEntity = new HttpEntity(allParameters, headers); - responseEntity = restTemplate.postForEntity(url, requestEntity , String.class); + + responseEntity = restTemplate.postForEntity(url, requestEntity , String.class); allResponseEntity = restTemplate.postForEntity(url, allRequestEntity , String.class); //----------------------------------- diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 3757f07f..a26428fd 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -140,10 +140,10 @@ public class NlibSearchController extends NlibCommonController { searchVO.setReQuery(""); searchVO.setReQueryChk("query"); } - //검색엔진 - try{ + //검색엔진 + try + { - searchVO = nlibSearchService.getSearch(searchVO); //페이지 셋팅 @@ -166,9 +166,13 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("pageVO", pageVO); model.addAttribute("searchVO", searchVO); - }catch(NumberFormatException e){ + } + catch(NumberFormatException e) + { log.error("searchList.do paging > NumberFormatException 발생 : " + e.toString()); - }catch(Exception e){ + } + catch(Exception e) + { log.error("searchList.do getSearch > Exception 발생 : " + e.toString()); } diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF index 7cfc6356..ccee5e2b 100644 --- a/src/main/webapp/META-INF/MANIFEST.MF +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -Built-By: ecpla +Built-By: scale Build-Jdk: 1.8.0_201 Created-By: Maven Integration for Eclipse diff --git a/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties b/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties index 49707cb7..dcb4dd98 100644 --- a/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties +++ b/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Mon Mar 13 10:07:45 KST 2023 +#Wed Feb 19 14:00:08 KST 2025 version=1.0.0 groupId=nlib m2e.projectName=iams.nlib -m2e.projectLocation=D\:\\work_source\\iams\\workspace\\iams.nlib +m2e.projectLocation=D\:\\iams\\workspace\\iams.nlib artifactId=nlib diff --git a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp index 8e038c48..1509d003 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -231,6 +231,9 @@ function delDetailFilter(name){ function allReset(){ $("#d_query").val(""); + $("#exactQuery").val(""); + $("#andQuery").val(""); + $("#notQuery").val(""); $("#d_bookIndex").val(""); $("#d_mngtNo").val(""); $("#d_creatYyyyStart").val(""); @@ -397,6 +400,14 @@ function detailPopClose(){
  • +

    +
    + + + +
    +
    • +

  • diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 55211b21..7d95549d 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -10432,8 +10432,12 @@ body.no-scroll { color: #000; } +.advanced-form-table li.row-keyword-detail { + width: 100% +} + .advanced-form-table .row-keyword-detail input { - width: calc(100% - 0px); + width: calc(33.333% - 10px); margin-right: 15px; } @@ -10441,6 +10445,15 @@ body.no-scroll { margin-right: 0; } +.advanced-form-table .row-keyword-detail2 input { + width: calc(100% - 0px); + margin-right: 15px; +} + +.advanced-form-table .row-keyword-detail2 input:last-child { + margin-right: 0; +} + .advanced-form-table .row-issued-year input { width: calc(50% - 16px); }