diff --git a/src/main/java/kccf/sch/service/vo/SearchVO.java b/src/main/java/kccf/sch/service/vo/SearchVO.java index 138250d2..16595f37 100644 --- a/src/main/java/kccf/sch/service/vo/SearchVO.java +++ b/src/main/java/kccf/sch/service/vo/SearchVO.java @@ -72,10 +72,20 @@ public class SearchVO { private String filter_info_sido ; //필터 더보기버튼 유지 private String filter_info_type ; //필터 더보기버튼 유지 + private String reQueryChk ="query"; //결과내재검색 체크 유지 + private String filter_mylist; //검색결과 필터 순서 저장 private String filter_info_mylist; //검색결과 필터 info 순서 저장 - + //임시 변수 + private String itemType; // 대출,열람,기타탭 + + public String getItemType() { + return itemType; + } + public void setItemType(String itemType) { + this.itemType = itemType; + } public String getFilter_info_mylist() { return filter_info_mylist; } @@ -386,6 +396,12 @@ public class SearchVO { + filter_mylist + ", filter_info_mylist=" + filter_info_mylist + "]"; } + public String getReQueryChk() { + return reQueryChk; + } + public void setReQueryChk(String reQueryChk) { + this.reQueryChk = reQueryChk; + } diff --git a/src/main/java/nlib/col/web/InterestController.java b/src/main/java/nlib/col/web/InterestController.java index 8ed98fb2..4d73d510 100644 --- a/src/main/java/nlib/col/web/InterestController.java +++ b/src/main/java/nlib/col/web/InterestController.java @@ -29,6 +29,7 @@ import nlib.col.service.DeptVO; import nlib.col.service.InterestService; import nlib.col.service.RentService; import nlib.user.service.NlibLoginVO; +import nlib.util.StringUtil; /** *
@@ -160,13 +161,18 @@ public class InterestController extends NlibCommonController
 		String message = "";
 		count = interestService.countInterest(vo);
 		
-		//중복된 관심자료가 있을시
-		if(count > 0)
+		if(!StringUtil.getString(masterId,"").equals(""))
 		{
-			message="이미 추가된 관심자료입니다.";
+			//중복된 관심자료가 있을시
+			if(count > 0)
+			{
+				message="이미 추가된 관심자료입니다.";
+			}else {
+				interestService.insertInterest(vo);
+				message="관심자료에 추가되었습니다.";
+			}
 		}else {
-			interestService.insertInterest(vo);
-			message="관심자료에 추가되었습니다.";
+			message="관심자료에 추가할 수 없습니다.";
 		}
 		return message;
 	}
diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java
index f4a89d91..5749b483 100644
--- a/src/main/java/nlib/sch/web/NlibSearchController.java
+++ b/src/main/java/nlib/sch/web/NlibSearchController.java
@@ -119,8 +119,8 @@ public class NlibSearchController extends NlibCommonController {
 	  	model.addAttribute("pageSizeCodes", pageSizeCodes);
 	  	model.addAttribute("masterType", masterType);
 	  	model.addAttribute("dtlsType", dtlsType);
-	  	model.addAttribute("firstCategoryInfo", clsf);
-	  	model.addAttribute("secondCategoryInfo", clsf);
+	  	model.addAttribute("firstCategoryList", clsf);
+	  	model.addAttribute("secondCategoryList", clsf);
 	  	/*model.addAttribute("orgList",vo);*/
 	  	
 	  	
@@ -137,6 +137,17 @@ public class NlibSearchController extends NlibCommonController {
 		sf1Vo.setSearchPort(searchPort);
 		sf1Vo.setSearchTimeOut(searchTimeOut);
 		
+		searchVO.setQuery(StringUtil.getString(searchVO.getQuery(), ""));
+		searchVO.setReQuery(StringUtil.getString(searchVO.getReQuery(), ""));
+		
+		//결과내재검색만 입력했을경우
+		if(searchVO.getQuery().length() == 0 && searchVO.getReQuery().length() > 0)
+		{
+			searchVO.setQuery(searchVO.getReQuery());
+			searchVO.setReQuery("");
+			searchVO.setReQueryChk("query");
+		}
+		
 		SearchCollectionResult collResult = searchService.getSearch(searchVO, sf1Vo);
 
 		all_totalCount = Integer.toString(searchService.getSearch_All_cnt(searchVO, sf1Vo));
@@ -324,14 +335,19 @@ public class NlibSearchController extends NlibCommonController {
 		e.printStackTrace();
 	}
 
-	String resultUrl ="";
+	List councilList = new ArrayList();
+	councilList.add("마포문화원");
+	councilList.add("서울문화원");
+	councilList.add("종로문화원");
+	/*List councilList = resourcesService.selectCouncilList(); */   	
+	model.addAttribute("councilList", councilList);
+	
 	
 	//자료유형
 	model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD));
     model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD));
 
-    List councilList = resourcesService.selectCouncilList();    	
-	model.addAttribute("councilList", councilList);
+    
     
 	// ams 서버 패스 정보
 	CmmUtil.setAmsPathModelMap(request,model);
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 fc364c01..bee7a23b 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listItems.jsp
@@ -257,7 +257,7 @@ function fn_search_article(pageIndex) {
                 적용
             
          
-         

    생산기관

    +

      생산기관

      z
    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 77c2a9e7..0af3f3c9 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -43,14 +43,12 @@ ${pageTitle} - - - - + + + + + +