From ad9d92de67afbd9bc05c03337aea99ee8d5f9c03 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Sun, 18 May 2014 04:49:12 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E6=96=87?=
 =?UTF-8?q?=E7=8C=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/scripts/data/ref-data-add.phtml     |  4 +--
 .../admin/views/scripts/data/ref-nav.phtml    |  2 +-
 application/module/Reference/Reference.php    | 33 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/application/admin/views/scripts/data/ref-data-add.phtml b/application/admin/views/scripts/data/ref-data-add.phtml
index 5624f118..5b556524 100644
--- a/application/admin/views/scripts/data/ref-data-add.phtml
+++ b/application/admin/views/scripts/data/ref-data-add.phtml
@@ -99,8 +99,8 @@ table thead tr th {background:#EBF2F6;}
 		    <td><?= $this->referenceType[$item['reftype']] ?></td>
 		    <td><?= $item['place'] ?></td>
                     <td>
-                        <a href="javascript:void(0);" onclick="$('#mdref')[0].reset();mdref.edit('',<?= $item['id']?>,'<?= $this->uuid; ?>',<?= $item['reftype']?>,<?= $item['place']?>)">编辑</a>
-                        <a href="/admin/data/ref/ac/deletemdref/mrid/<?= $item['mrid']?>">删除</a>
+                        <a href="javascript:void(0);" onclick="$('#mdref')[0].reset();mdref.edit(<?= $item['mrid']?>,<?= $item['id']?>,'<?= $this->uuid; ?>',<?= $item['reftype']?>,<?= $item['place']?>)">编辑</a>
+                        <a href="/admin/data/ref/ac/deletemdref/mrid/<?= $item['mrid']?>">移除</a>
                     </td>
                 </tr>
             	<?php endforeach; ?>
diff --git a/application/admin/views/scripts/data/ref-nav.phtml b/application/admin/views/scripts/data/ref-nav.phtml
index 24db0df8..97e50ac8 100644
--- a/application/admin/views/scripts/data/ref-nav.phtml
+++ b/application/admin/views/scripts/data/ref-nav.phtml
@@ -1,6 +1,6 @@
 <ul class="nav nav-tabs">
     <?php if (!empty($this->uuid)) : ?>
-    <li class="active"><a href="/admin/data/ref">数据文献</a></li>
+    <li class="active"><a href="/admin/data/ref/uuid/<?= $this->uuid ?>">数据文献</a></li>
     <?php endif; ?>
     <li <?= empty($this->ac) && empty($this->uuid) ? 'class="active"':"" ?>><a href="/admin/data/ref">浏览所有</a></li>
     <li <?= $this->ac=="water" ? 'class="active"':"" ?>><a href="/admin/data/ref/ac/water">WATER文献</a></li>
diff --git a/application/module/Reference/Reference.php b/application/module/Reference/Reference.php
index 5b525a92..a1f0afb3 100644
--- a/application/module/Reference/Reference.php
+++ b/application/module/Reference/Reference.php
@@ -332,7 +332,38 @@ class Reference
 			$order = "ref.{$this->order} {$this->sort}";
 		}
 		
-		$sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join mdref r on ref.id=r.refid
+		$sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join {$this->table->metadata_reference} r on ref.id=r.refid
+			$wheresql
+			ORDER BY $order";
+		$rs=$this->db->query($sql);
+		return $rs->fetchAll();
+	}
+
+	//Get references with data UUID
+	public function fetchReferencesWithUUID($uuid)
+	{
+		$wheresql = array();
+		//$wheresql[]=" r.uuid='$uuid' ";
+		if(!empty($this->keyword))
+		{
+			$wheresql[] = " (ref.title LIKE '%{$this->keyword}%' OR ref.reference LIKE '%{$this->keyword}%') ";
+		}
+		if(count($wheresql)>0)
+		{
+			$wheresql = " WHERE ".join(" AND ",$wheresql);
+		}else{
+			$wheresql = "";
+		}
+		
+		if(empty($this->order))
+		{
+			$order = "ref.year,ref.title";
+		}else{
+			$order = "ref.{$this->order} {$this->sort}";
+		}
+		
+		$sql="select distinct ref.*,r.reftype,r.place,r.id as mrid from {$this->table->reference} ref left join
+			(select * from {$this->table->metadata_reference} r where uuid='$uuid') r on ref.id=r.refid
 			$wheresql
 			ORDER BY $order";
 		$rs=$this->db->query($sql);