From ca8626b6f7f2daf2faa44a1cce5efd13d620c212 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sun, 22 Dec 2013 02:01:24 +0000
Subject: [PATCH] merge heihedata branch r4132 to trunk

---
 application/default/views/scripts/hiwater/view.phtml | 11 +++++++++--
 htdocs/index.php                                     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/default/views/scripts/hiwater/view.phtml b/application/default/views/scripts/hiwater/view.phtml
index 7a851a6d..1cf65878 100644
--- a/application/default/views/scripts/hiwater/view.phtml
+++ b/application/default/views/scripts/hiwater/view.phtml
@@ -46,9 +46,16 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
             <ol>
             <?php foreach($this->mcitation as $ref) :
             if (empty($ref->link))
-                echo '<li>'.$ref->reference.'</li>';
+			{
+                echo '<li>'.$ref->reference;
+				echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+				if(!empty($ref->attid)) {
+					echo ' <a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+				}
+				echo "</li>";
+			}
             else
-                echo '<li>'.$ref->reference.' <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
+                echo '<li>'.$ref->reference.'<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a> <a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a></li>';
             endforeach;
             ?>
             </ol>
diff --git a/htdocs/index.php b/htdocs/index.php
index 202c2a86..f57e5098 100755
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -4,7 +4,7 @@ ini_set('display_errors', 1);
 date_default_timezone_set('Asia/Shanghai');
 
 // directory setup and class loading
-set_include_path('.' . PATH_SEPARATOR . '/var/www/westdc.westgis.ac.cn/include/'
+set_include_path('.' . PATH_SEPARATOR . '/Users/wangliangxu/Projects/metadata/include/'
      . PATH_SEPARATOR . '../application/models'
      . PATH_SEPARATOR . '../application/module'
      . PATH_SEPARATOR . '../application/default/controllers'