diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index 0040163d..e410c7ca 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -1977,23 +1977,23 @@ class DataController extends Zend_Controller_Action $ac = $this->_request->getParam('ac'); if ($ac=='unready') { //列出没有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'; } else if ($ac=='prepare') { //列出有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'; } else if ($ac=='unsubmit') { //列出有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'; } else if ($ac=='submit') { //列出有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'; } 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 {$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'; } $sth = $this->db->prepare($sql); diff --git a/application/default/views/scripts/data/doi.phtml b/application/default/views/scripts/data/doi.phtml index 3d5f9091..369fc9bd 100644 --- a/application/default/views/scripts/data/doi.phtml +++ b/application/default/views/scripts/data/doi.phtml @@ -7,7 +7,6 @@ $this->nav[] = array('link'=>"/data/doi",'title'=>'DOI浏览'); $this->theme->AppendPlus($this,'colorbox'); ?>
-render('breadcrumbs.phtml') ?> partial('data/tools.phtml'); ?>