From a7a20b8cd6fe9fa73c81788c46764cc3da701264 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Tue, 16 Nov 2021 10:03:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9B=90=EB=AC=B8=EB=B3=B4=EA=B8=B0=EC=8B=9C?=
 =?UTF-8?q?=20=EC=A1=B0=EA=B1=B4=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/nlib/cmm/web/MainController.java |  2 ++
 src/main/resources/nlib/nlib.properties        | 12 ++++++++++++
 .../WEB-INF/jsp/nlib/cmm/headerSubPart.jsp     |  2 ++
 src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp  |  2 +-
 .../jsp/nlib/collection/listInterests.jsp      |  2 +-
 .../jsp/nlib/collection/searchItemDetail.jsp   |  7 +++----
 .../WEB-INF/jsp/nlib/collection/searchList.jsp |  2 +-
 src/main/webapp/css/default.css                |  2 +-
 src/main/webapp/js/nlib.js                     | 18 ++++++++++++++++--
 9 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nlib/cmm/web/MainController.java b/src/main/java/nlib/cmm/web/MainController.java
index 7215f8d4..c101896b 100644
--- a/src/main/java/nlib/cmm/web/MainController.java
+++ b/src/main/java/nlib/cmm/web/MainController.java
@@ -181,6 +181,8 @@ public class MainController extends NlibCommonController {
 		model.addAttribute("cartCnt", cartCnt);
 		model.addAttribute("unreadNotiCnt", unreadNotiCnt);
 		model.addAttribute("docViewUrl", NlibProperty.getString("pdf.url"));
+		model.addAttribute("videoViewUrl", NlibProperty.getString("video.url"));
+		model.addAttribute("imageViewUrl", NlibProperty.getString("image.url"));
 		
 		return "nlib/cmm/headerSubPart";
 	}
diff --git a/src/main/resources/nlib/nlib.properties b/src/main/resources/nlib/nlib.properties
index 96530c30..36725dc9 100644
--- a/src/main/resources/nlib/nlib.properties
+++ b/src/main/resources/nlib/nlib.properties
@@ -199,3 +199,15 @@ shorturl.api = https://local-dev.nculture.org/yourls-api.php?signature=d48a5ab90
 pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=I
 # \uac1c\ubc1c (\ucd94\ud6c4)
 #pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N
+
+# \uc6d0\ubb38\ubcf4\uae30 (IMAGE)
+# \uac1c\ubc1c (\ud604\uc7ac) 
+image.url = https://port-dev.nculture.org/nImageView.do?nImage=I
+# \uac1c\ubc1c (\ucd94\ud6c4)
+#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N
+
+# \uc6d0\ubb38\ubcf4\uae30 (VIDEO)
+# \uac1c\ubc1c (\ud604\uc7ac) 
+video.url = https://port-dev.nculture.org/nvodView.do?nvod=I
+# \uac1c\ubc1c (\ucd94\ud6c4)
+#pdf.url = https://port-dev.nculture.org/npdfView.do?npdf=N
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp
index 8a1822b7..f96ec1db 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp
@@ -12,6 +12,8 @@ String councilNm = (String)session.getAttribute("councilNm");
 <script>
 $(document).ready(function() {
 	DOC_VIEW_URL = "${docViewUrl}";
+	VIDEO_VIEW_URL = "${videoViewUrl}";
+	IMAGE_VIEW_URL = "${imageViewUrl}";
 });
 
 function goSearch(){
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
index e1c8d992..e5fb3909 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
@@ -255,7 +255,7 @@ function fn_listPops(typeDivCd) {
                                             ${itemOnline.masterId }</li>
                                         </ul>
                                         <div class="btn-box">
-                                            <div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }')">원문보기</a></div>
+                                            <div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }','${itemOnline.typeDivCd}','${itemOnline.dtlsTypeDivCd}')">원문보기</a></div>
                                             <div class="RIS"><a href="javascript:void(0)" onclick="risShow('${itemOnline.masterId }')">RIS</a></div>
                                         </div>
                                     </div>
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 9deb6c80..a5beac5d 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
@@ -224,7 +224,7 @@
                  }
                  if(!fn_isEmpty(obj.interfaceId) && !fn_isEmpty(obj.openDivCd) && obj.openDivCd != '3' && obj.digitalReadYn == 'Y')
                  {
-                     t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "','" + obj.masterId + "');\">원문보기</button>";     
+                     t_btn+= "<button type=\"button\" class=\"btn-color\" onclick=\"gfn_showDocPdf('" + obj.interfaceId + "','" + obj.masterId + "','" + obj.typeDivCd + "','" + obj.dtlsTypeDivCd + "');\">원문보기</button>";     
                  }
                  t_btn+= "<button type=\"button\" class=\"btn-gray\" onclick=\"risShow('" + obj.masterId +"');\">RIS</button>";
                  
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 d0a91972..6ca23d2c 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
@@ -128,7 +128,7 @@ function goList(){
                     <div class="right">
                         <div class="con-1">
                         <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
-                            <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>')";>원문보기</button>
+                            <button type="button" class="view" onclick="gfn_showDocPdf('<c:out value="${result.interfaceId}"/>','<c:out value="${result.masterId}"/>','<c:out value="${result.typeDivCd}"/>','<c:out value="${result.dtlsTypeDivCd}"/>')";>원문보기</button>
                         </c:if>
                             <button type="button" class="ris" onclick="risShow('<c:out value="${result.masterId}"/>')";>RIS</button>
                         <c:if test='${result.MUseYn == "Y"}'>
@@ -137,10 +137,9 @@ function goList(){
                         <c:if test='${result.MUseYn != "Y"}'>
                             <button type="button" class="favorit" onclick="fn_changeInterestBtn('${result.masterId }', 'on');">즐겨찾기</button>
                         </c:if>
-                        <%-- <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId)}">
+                        <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
                             <button type="button" class="share" data-curl="${pdfUri}<c:out value="${result.interfaceId}"/>">공유</button>
-                        </c:if> --%>
-                        <button type="button" class="share" data-cUrl="${pdfUri}3568">공유</button>
+                        </c:if>
                         </div>
                         <div class="con-2">
                             <div class="de-data">
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 06818a00..52d69b2d 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@@ -436,7 +436,7 @@ function fn_search_article(pageIndex) {
                                                                 </c:otherwise>
                                                            </c:choose>
                                                             <c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
-                                                               <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}')";>원문보기</button>
+                                                               <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
                                                             </c:if>
                                                             <button type="button" class="btn-gray" onclick="risShow('${result.masterId}')";>RIS</button>
                                                         </div>
diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css
index bf9f7458..3f4ed7c6 100644
--- a/src/main/webapp/css/default.css
+++ b/src/main/webapp/css/default.css
@@ -735,7 +735,7 @@ transform: rotate(45deg);}
 .filter-wrap .filter {margin-top: 32px;}
 .filter-wrap .filter-tit {clear: both;border-bottom: 1px solid #ccc;padding-bottom: 6px;_margin-bottom: 16px;}
 .filter-wrap .filter-tit h3 {color: #000;font-size: 16px;float: left;}
-.filter-wrap .filter-tit .btn-toggle {float: right;background: url(/images/btn/btn-minus.jpg) no-repeat center right;text-indent: -9999px;}
+.filter-wrap .filter-tit .btn-toggle {float: right;text-indent: -9999px;}
 .filter-wrap .filter-tit .btn-toggle.on {background: url(/images/btn/btn-plus.png) no-repeat center right;}
 .filter-wrap .filter-tit:after {content: "";display: block;clear: both;}
 .filter-wrap .filter .depth-1 {margin-top: 11px;padding-left: 10px;}
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 5c753df9..8c27ece5 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -425,7 +425,21 @@ function fn_formatDateStr(yyyymmdd, defVal) {
 
 // 원문보기 
 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
-function gfn_showDocPdf(interfaceId,masterId) {
+var VIDEO_VIEW_URL = "https://port.nculture.org/nvodView.do?nvod=N";
+var IMAGE_VIEW_URL = "https://port.nculture.org/nImageView.do?nImage=N";
+function gfn_showDocPdf(interfaceId,masterId,typeDivCd,dtlsTypeDivCd) {
+	var url="";
+	
+	if(typeDivCd == "IT_PHOTO" && (dtlsTypeDivCd == "C199" || dtlsTypeDivCd == "C01" || dtlsTypeDivCd == "C1"))
+	{
+		url = IMG_VIEW_URL;
+	}else if((typeDivCd == "IT_VIDEO") && (dtlsTypeDivCd == "C290" || dtlsTypeDivCd == "C02" || dtlsTypeDivCd == "C03"))
+	{
+		url = VIDEO_VIEW_URL;
+	}else{
+		url = IMAGE_VIEW_URL;
+	}
+	
 	//로그 
 	$.ajax({
         type: "post",
@@ -434,7 +448,7 @@ function gfn_showDocPdf(interfaceId,masterId) {
     }).done(function(response){
     });
 	
-	var openNewWindow = window.open(DOC_VIEW_URL + interfaceId, "_blank");
+	var openNewWindow = window.open(url + interfaceId, "_blank");
 }
 
 function snsShare(snsType, url) {