From 33660fac173ea58fa8321ac1ac6bfd8775836b43 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 8 May 2013 05:47:28 +0000
Subject: [PATCH] =?UTF-8?q?fix=20#3459,=20=E5=AE=9E=E7=8E=B0DOI=E7=9A=84?=
 =?UTF-8?q?=E5=89=8D=E5=8F=B0=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/DataController.php |  4 ++--
 application/default/views/scripts/data/view.phtml  | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index afce6fab..4e683426 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -533,8 +533,8 @@ class DataController extends Zend_Controller_Action
     function viewAction()
     {
     	$id = (int)$this->_request->getParam('id');
-    	$sql="select m.*,s.status,g.id as gid,t.filename from normalmetadata m left join mdstatus s on m.uuid=s.uuid 
-    	left join thumbnail t on t.id=m.id left join geonetworkmetadata g on m.uuid=g.uuid where ";
+    	$sql="select m.*,s.status,g.id as gid,t.filename,i.doi as datadoi,i.authors,i.author_en,i.publisher,i.publisher_en, date_part('year',i.ts_published) as publish_year from normalmetadata m left join mdstatus s on m.uuid=s.uuid 
+    	left join thumbnail t on t.id=m.id left join geonetworkmetadata g on m.uuid=g.uuid left join datadoi i on i.uuid=m.uuid where ";
     	if (empty($id)) {
     		$uuid = $this->_request->getParam('uuid');
     		if (empty($uuid)) $this->_redirect('/data');
diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml
index 13e5095d..2d85e328 100755
--- a/application/default/views/scripts/data/view.phtml
+++ b/application/default/views/scripts/data/view.phtml
@@ -30,9 +30,14 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			<?php if ($md->citation) : ?>
             <hr />
             <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
-            <p><?php echo $this->escape($md->citation);?></p>
-            <?php endif; ?>
-        	<?php if ($this->ref) : ?>
+			<p><?php  if (empty($md->datadoi) || strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
+			<?php endif; echo $this->escape($md->citation);?></p>
+            <?php  if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+			<p><span class="label label-info">数据的引用</span><?php
+			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
+			echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
+			?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/ris/lang/en/uuid/<?php echo $md->uuid; ?>">RIS英文格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> | <a href="/service/bibtex/lang/en/uuid/<?php echo $md->uuid; ?>">Bibtex英文格式</a>)</p>
+        	<?php endif; endif; if ($this->ref) : ?>
             <hr />
             <h4><i class="icon-eye-open text-success"></i>建议参考文献</h4>
             <ol>