bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge sanjiangyuan-sub r5225 into sjy-erc

This commit is contained in:
wlx 2015-01-31 09:23:56 +00:00
parent aad2af30e7
commit 25faa0fe72
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/default/controllers/DataController.php
View File

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

1
application/default/views/scripts/data/doi.phtml
View File

@ -7,7 +7,6 @@ $this->nav[] = array('link'=>"/data/doi",'title'=>'DOI浏览');
$this->theme->AppendPlus($this,'colorbox'); $this->theme->AppendPlus($this,'colorbox');
?> ?>
<div class='row-fluid'> <div class='row-fluid'>
<?= $this->render('breadcrumbs.phtml') ?>
<?= $this->partial('data/tools.phtml'); ?> <?= $this->partial('data/tools.phtml'); ?>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li id="Nav-doi-publish"><a href="/data/doi">已发布DOI的数据</a></li> <li id="Nav-doi-publish"><a href="/data/doi">已发布DOI的数据</a></li>