添加DOI浏览功能

application/default/controllers/DataController.php

@@ -2187,23 +2187,19 @@ class DataController extends Zend_Controller_Action
     	$ac = $this->_request->getParam('ac');
     	if ($ac=='unready') {
     		//列出没有DOI的数据
-			$sql="select m.* from normalmetadata m where length(m.doi)<3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
+			$sql="select m.* from normalmetadata m where m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
 			$this->view->pageID='doi-unready';
-    	} else if ($ac=='prepare') {
-    		//列出有DOI但还未进行提交申请的数据
-			$sql="select m.* from normalmetadata m where length(m.doi)>3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
-			$this->view->pageID='doi-prepare';
     	} else if ($ac=='unsubmit') {
     		//列出有DOI并计划提交申请的数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_created) as ts_created from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_created is not null and d.ts_submitted is null order by d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_created) as ts_created from normalmetadata m left join datadoi d on m.uuid=d.uuid where d.ts_created is not null and d.ts_submitted is null order by d.ts_created desc";
 			$this->view->pageID='doi-unsubmit';
     	} else if ($ac=='submit') {
     		//列出有DOI并计划提交申请的数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_submitted is not null and d.ts_published is null order by d.ts_submitted desc,d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted from normalmetadata m left join datadoi d on m.uuid=d.uuid where d.ts_submitted is not null and d.ts_published is null order by d.ts_submitted desc,d.ts_created desc";
 			$this->view->pageID='doi-submit';
     	} else if ($ac=='publish' || empty($ac)) {
     		//默认：列出最新发布的DOI数据
-			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted,date(d.ts_published) as ts_published from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_published is not null order by d.ts_published desc,d.ts_submitted desc,d.ts_created desc";
+			$sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted,date(d.ts_published) as ts_published from normalmetadata m left join datadoi d on m.uuid=d.uuid where d.ts_published is not null order by d.ts_published desc,d.ts_submitted desc,d.ts_created desc";
 			$this->view->pageID='doi-publish';
 		}	
 		$sth = $this->db->prepare($sql);

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

@@ -13,7 +13,6 @@ $this->theme->AppendPlus($this,'colorbox');
 <li id="Nav-doi-publish"><a href="/data/doi">已发布DOI的数据</a></li>
 <li id="Nav-doi-submit"><a href="/data/doi/ac/submit">已提交DOI申请的数据</a></li>
 <li id="Nav-doi-unsubmit"><a href="/data/doi/ac/unsubmit">未提交DOI申请的数据</a></li>
-<li id="Nav-doi-prepare"><a href="/data/doi/ac/prepare">准备申请DOI的数据</a></li>
 <li id="Nav-doi-unready"><a href="/data/doi/ac/unready">无DOI的数据</a></li>
 </ul>
 </div>

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

@@ -32,6 +32,7 @@ $this->headTitle()->setSeparator(' - ');
   <li><a class="btn"  href="/data/timemap"><i class="icon-film"></i>时空浏览</a></li>
   <li><a class="btn"  href="/data/organization"><i class="icon-filter"></i>单位浏览</a></li>
   <li><a class="btn"  href="/data/author"><i class="icon-user-md"></i>作者浏览</a></li>
+  <li><a class="btn"  href="/data/doi"><i class="icon-paper-clip"></i>DOI浏览</a></li>
   </ul>
 </div>