From 220dfb4549fce548346f411ab4a7b7eea145b7c5 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Mon, 20 May 2013 13:44:40 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=A6=96=E9=A1=B5doi?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=B9=B4=E4=BB=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/IndexController.php | 2 +-
 application/default/views/scripts/index/index.phtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/default/controllers/IndexController.php b/application/default/controllers/IndexController.php
index 8603a1c2..f128ace4 100755
--- a/application/default/controllers/IndexController.php
+++ b/application/default/controllers/IndexController.php
@@ -85,7 +85,7 @@ class IndexController extends Zend_Controller_Action
 		
 		$this->view->list_news = $rows;
 	    
-		$sql="select * from datadoi where ts_published is not null order by ts_published desc limit 4";
+		$sql="select d.*,m.ts_published as publish_year from datadoi d left join metadata m on d.uuid=m.uuid where d.ts_published is not null order by ts_published desc limit 4";
 		$sth = $this->db->query($sql);
 		$this->view->dois = $sth->fetchAll();
 		
diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index e6b6bf42..03df50ba 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -79,7 +79,7 @@
 	<h4><a href="/data/doi">最新DOI数据</a></h4>
 	<ul class="unstyled">
 	<?php foreach($this->dois as $doi) :
-		echo '<li class="well well-small"><a href="/data/'.$doi->uuid.'">'.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.date('Y',strtotime($doi->ts_published)).'. doi:'.$doi->doi.'</a></li>';
+		echo '<li class="well well-small"><a href="/data/'.$doi->uuid.'">'.substr($doi->authors,1,-1).'. '.$doi->title.'. '.$doi->publisher.', '.(empty($doi->publish_year)?date('Y',strtotime($md->ts_published)):date('Y',strtotime($doi->publish_year))).'. doi:'.$doi->doi.'</a></li>';
 		//echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
 		endforeach;
 	?>