From facbc0d5c410c5455a53267533277b308faceff6 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 18 Jun 2014 05:48:26 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/DataController.php       |  4 +++-
 .../default/views/scripts/data/index.phtml       | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index db6809b7..c7cc0b63 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -45,7 +45,9 @@ class DataController extends Zend_Controller_Action
     	$k5=$state->fetchAll();
     	$this->view->keywords=array('place'=>$k1,'theme'=>$k2,'discipline'=>$k3,'stratum'=>$k4,'temporal'=>$k5);
     	//最新10个入库数据
-    	$state=$this->db->query("select id,uuid,title from {$this->submd} order by id desc limit 10");
+    	$state=$this->db->query("select id,uuid,title,ts_created from {$this->submd} order by ts_created desc limit 10");
+        $this->view->metadata = $state->fetchAll();
+    	$state=$this->db->query("select m.id,m.uuid,m.title,s.viewed from {$this->submd} m left join mdstat s on m.uuid=s.uuid order by s.viewed desc limit 10");
         $this->view->metadata = $state->fetchAll();
         //服务
     	$searchform=new SearchForm();
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 776c4412..57304d25 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -57,12 +57,22 @@
     </div>
 </div>
 <div class="row">
-        <h4>数据最近更新<a href="/service/feed" target="_blank"><i class=“icon-rss”></i></a></h4>
+<div class="span6">
+        <h4>数据最近更新<a href="/service/feed" target="_blank"><i class="icon-rss"></i></a></h4>
         <ul class="unstyled">
             <?php foreach($this->metadata as $md) : ?>
-            <li><i class=“icon-map-marker”></i><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a> </li>     
+            <li><i class="icon-map-marker"></i><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a> [<?= date('Y-m-d',strtotime($md['ts_created'])) ?>]</li>
             <?php endforeach; ?>
             <li class="more"><a href="/data/browse" class="pull-right">更多</a></li>
         </ul>
 </div>
-
+<div class="span6">
+        <h4>最多浏览数据集<a href="/service/feed" target="_blank"><i class="icon-rss"></i></a></h4>
+	<ul class="unstyled">
+            <?php foreach($this->viewedmd as $md) : ?>
+            <li><i class="icon-map-marker"></i><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a>[<?= $md['viewed'] ?>]</li>     
+            <?php endforeach; ?>
+            <li class="more"><a href="/data/browse" class="pull-right">更多</a></li>
+        </ul>
+</div>
+</div>
\ No newline at end of file