merge trunk r4172 - r4175 to heihedata branch

application/default/controllers/ServiceController.php

@@ -1405,7 +1405,7 @@ class ServiceController extends Zend_Controller_Action
 		
 		$pageSize = 10;//每页容量
 		
-		$sql = "select md.title,md.uuid from mdref mr
+		$sql = "select distinct md.title,md.uuid from mdref mr
 				right join normalmetadata md on md.uuid=mr.uuid
 				 where mr.refid=$id";
 		$pagnation="";
@@ -1463,7 +1463,7 @@ class ServiceController extends Zend_Controller_Action
 				echo 0;
 				return;
 			}
-			$sql = "select count(md.id) as total from mdref mr
+			$sql = "select count(distinct md.id) as total from mdref mr
 					right join normalmetadata md on md.uuid=mr.uuid
 					 where mr.refid=$id";
 			$rs = $this->db->query($sql);

application/default/views/scripts/data/view.phtml

@@ -34,6 +34,25 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
         </p>	
         </div>
         <div>
+			<?php if ($this->mcitation) : ?>
+            <hr />
+            <h4><i class="icon-eye-open text-success"></i>本数据要求的多篇文献引用</h4>
+            <ol>
+            <?php foreach($this->mcitation as $ref) :
+		echo '<li>'.$ref->reference;
+		echo '<a href="/knowledge/paper/id/'.$ref->id.'"><i class="icon-info-sign text-success"></i>查看</a>';
+            if (empty($ref->link))
+            { 
+			if(!empty($ref->attid)) 
+				echo '<a href="/service/attach/id/'.$ref->attid.'"><i class="icon-download text-success"></i>下载</a>';
+	}else{ 
+		echo '<a href="'.$ref->link.'"><i class="icon-download text-success"></i>下载</a>';
+	}
+	echo "</li>";
+            endforeach;
+            ?>
+            </ol>
+			<?php endif; ?>				
 			<?php if ($md->citation) : ?>
             <hr />
             <h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
@@ -47,7 +66,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 			echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. doi:'.$md->doi;
 			echo ' ['.str_replace('"','',substr($md->author_en,1,-1)).'. '.$md->title_en.'. '.$md->publisher_en.', '.(empty($md->ts_published)?$md->publish_year:date('Y',strtotime($md->ts_published))).'. 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) : ?>
+        	<?php endif;  if ($this->ref) : ?>
             <hr />
             <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
             <ol>

application/default/views/scripts/knowledge/search.phtml

@@ -43,7 +43,7 @@ $('#Nav-knowledge-westplan').addClass('active');
 </script>
 <script>
 function showdata(id,page){
-	var url="/service/tagdatalist/id/"+id;
+	var url="/service/refdatalist/id/"+id;
 	$.ajax({
 		'type':"GET",
 		'url':url,