diff --git a/src/main/java/nlib/sch/service/NlibSearchVO.java b/src/main/java/nlib/sch/service/NlibSearchVO.java index 274f51d7..4ca1a063 100644 --- a/src/main/java/nlib/sch/service/NlibSearchVO.java +++ b/src/main/java/nlib/sch/service/NlibSearchVO.java @@ -34,6 +34,8 @@ public class NlibSearchVO extends PagingVO { private String creatYyyyEnd = ""; //생산년도 검색(종료일) private String creatYyyyYn = ""; //미상포함 Y N + private String collectionList = ""; //상세검색시 콜렉션 셀렉트 검색 + private String bookIndex = ""; //목차검색 private String createStartDate = ""; //연대 검색(시작일) private String createEndDate = ""; //연대 검색(종료일) private String mngtNo = ""; //관리번호 @@ -46,11 +48,11 @@ public class NlibSearchVO extends PagingVO { private String reQuery = ""; //결과내 재검색 private String reQueryChk ="query"; //결과내재검색 체크 유지 private String realQuery =""; //사용자페이지에 보여줄 검색내용 - private String lib_total_totalCount = ""; //전체의 총 COUNT - private String lib_loan_totalCount = ""; //대출의 총 COUNT - private String lib_online_totalCount = ""; //온라인열람의 총 COUNT - private String lib_offline_totalCount = ""; //방문열람의 총 COUNT - private String lib_etc_totalCount = ""; //기타의 총 COUNT + private String lib_total_totalCount = "0"; //전체의 총 COUNT + private String lib_loan_totalCount = "0"; //대출의 총 COUNT + private String lib_online_totalCount = "0"; //온라인열람의 총 COUNT + private String lib_offline_totalCount = "0"; //방문열람의 총 COUNT + private String lib_etc_totalCount = "0"; //기타의 총 COUNT private String totalCount = "0"; //현재 선택된 콜렉션의 총 COUNT @@ -333,6 +335,7 @@ public class NlibSearchVO extends PagingVO { add(map,"createStartDate",this.createStartDate); add(map,"createEndDate",this.createEndDate); add(map,"MNGT_NO",this.mngtNo); + add(map,"BOOK_INDEX",this.bookIndex); add(map,"AGE_CODE",this.ageCode.replaceAll("[,]", "|")); add(map,"USE_STATUS",this.useStatus); add(map,"TYPE_DIV_CD",this.typeDivCd); @@ -378,4 +381,16 @@ public class NlibSearchVO extends PagingVO { public void setFilter_agency(String filter_agency) { this.filter_agency = filter_agency; } + public String getBookIndex() { + return bookIndex; + } + public void setBookIndex(String bookIndex) { + this.bookIndex = bookIndex; + } + public String getCollectionList() { + return collectionList; + } + public void setCollectionList(String collectionList) { + this.collectionList = collectionList; + } } diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index aaad2681..0725449a 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -110,7 +110,15 @@ public class NlibSearchServiceImpl implements NlibSearchService{ //전체 검색 (각 탭별 count가 목적) collectionTemp = searchVO.getCollection(); - searchVO.setCollection("ALL"); + if("".equals(StringUtil.getString(searchVO.getCollectionList(), "")) || "ALL".equals(StringUtil.getString(searchVO.getCollectionList(), ""))) + { + searchVO.setCollection("ALL"); + }else + { + //상세검색시 콜렉션리스트만 카운트하기위해 추가. + searchVO.setCollection("lib_total,"+searchVO.getCollectionList()); + } + MultiValueMap allParameters= searchVO.getSearchMap(); searchVO.setCollection(collectionTemp); //post방식 diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index d7203121..b84229cc 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -89,7 +89,7 @@ data : {"masterIdList" : masterIdArray}, success : function(){ alert("선택하신 관심자료가 삭제되었습니다."); - fn_search_article($("#pageSize").val(), 1); + fn_searchArticle($("#pageSize").val(), 1); },error : function(){ } @@ -107,14 +107,6 @@ $("input:checkbox[name = 'interestChk']").attr("checked", true); } } - // 선택한 글 상세 보기로 이동 - function fn_viewDetail(articleId) { - $('#articleForm').removeAttr('onsubmit'); - $("#articleForm").attr("action", "${pageContext.request.contextPath}/bbs/selectAncmntArticle.do"); - $("#articleId").val(articleId); - $("#articleForm").submit(); - } - // 그리드 데이터 조회 호출 function fn_searchArticle(pageIndex) { @@ -157,15 +149,15 @@ $("#itemsCount").text(jsonObj.itemsCount); } if(!jsonObj.data || jsonObj.data.length <= 0 ) { - /* $("div.list-data div.no-result").show(); */ + $("div.list-data li.no-result").show(); } else { - /* $("div.list-data div.no-result").hide(); */ + $("div.list-data li.no-result").hide(); // 출력 $.each(jsonObj.data,function(key,obj) { var t_data = ""; var count = 0; - t_data += "
"; + t_data += "
"; t_data += "\"즐겨찾기\"즐겨찾기
"; t_data += "
" if(obj.openDivCd != "3") @@ -234,7 +226,7 @@ } if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3') { - t_btn+= ""; + t_btn+= ""; } t_btn+= ""; @@ -301,6 +293,9 @@
자료정보
이용
+
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp index bee7a23b..6066cb0d 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp @@ -100,11 +100,6 @@ function fn_tabMove_sch(itemType){ fn_search_article($("#pageIndex").val()); } - -function docView(){ - alert("원문보기"); -} - function risDownloadFile(){ alert("RIS"); } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index 1eaf3cf2..9b6d0d23 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -88,7 +88,9 @@
- + + + 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 93e75f83..a15c7395 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -138,10 +138,6 @@ function fnFilterSch(){ document.referencelistForm.submit(); } -function docView(){ - alert("원문보기"); -} - //상세보기 function goDetail(masterId){ $("#masterId").val(masterId); @@ -421,12 +417,17 @@ function fn_search_article(pageIndex) { - +
+ +
  • + 검색결과가 없습니다. +
    • +     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 1aec6a67..86bf90b7 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp @@ -164,6 +164,19 @@ $(document).ready(function() { } }); + $('#d_referencelistForm input[name=collectionList]').change(function () { + var id = $(this).attr('id'); + if(id == "class-chk1") + { + $("input[id^='class']").each(function() { + if($(this).attr('id') != id) + $(this).prop('checked', false); + }); + }else{ + $("#class-chk1").prop('checked',false); + } + }); + if(document.getElementById("referencelistForm")){ //상세검색 세팅 detailSearchSetting(); @@ -234,9 +247,9 @@ function detailSearchSetting(){
  • -

    +

    - +
  • @@ -264,7 +277,7 @@ function detailSearchSetting(){

  • -
    +
    @@ -277,11 +290,11 @@ function detailSearchSetting(){

  • -
    -
    -
    -
    -
    +
    +
    +
    +
    +
    • diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js index af58b39d..0c53cb7d 100644 --- a/src/main/webapp/js/nlib.js +++ b/src/main/webapp/js/nlib.js @@ -357,7 +357,11 @@ function pageLoad(fnName,pageIndex, totRecordCount, startPage, endPage, lastPage html+="
  • 맨끝으로
    • "; } }else{ - html+= "자료가 없습니다."; + html+="
  • 처음으로
    • " + html+="
  • 이전
    • " + html+="
  • "+ startPage +"
    • " + html+="
  • 다음
    • " + html+="
  • 맨끝으로
    • "; } @@ -384,3 +388,8 @@ function fn_formatDateStr(yyyymmdd, defVal) { return defVal; } + +function docView(interfaceId){ + var openNewWindow = window.open("about:blank"); + openNewWindow.location.href = "https://port-dev.nculture.org/npdfView.do?npdf=I"+interfaceId; +}