From f2962b1f400320901b4f3024e9e7b5ab8404576e Mon Sep 17 00:00:00 2001 From: wlx Date: Sat, 31 Jan 2015 08:36:35 +0000 Subject: [PATCH] merge sanjiangyuan-sub r5216, r5217 into sjy-water --- .../default/controllers/DataController.php | 10 ++-- .../default/views/scripts/data/doi.phtml | 1 - .../default/views/scripts/data/view.phtml | 59 ++++++------------- 3 files changed, 24 insertions(+), 46 deletions(-) diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index bc060e88..0040163d 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 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 {$this->submd} 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-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"; + $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"; $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 {$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"; $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 {$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"; $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 {$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"; $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 9762ec3f..3d5f9091 100644 --- a/application/default/views/scripts/data/doi.phtml +++ b/application/default/views/scripts/data/doi.phtml @@ -13,7 +13,6 @@ $this->theme->AppendPlus($this,'colorbox'); - diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml index 1ed873b1..ea950bc2 100755 --- a/application/default/views/scripts/data/view.phtml +++ b/application/default/views/scripts/data/view.phtml @@ -34,39 +34,21 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>

- mcitation) : ?> -
-

本数据要求的多篇文献引用

-
    - mcitation as $ref) : - echo '
  1. '.$ref->reference; - echo '查看'; - if (empty($ref->link)) - { - if(!empty($ref->attid)) - echo '下载'; - }else{ - echo '下载'; - } - echo "
    2. "; - endforeach; - ?> -
- - citation) : ?> + citation || $md->datadoi) : ?>

本数据引用方式

-

datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 - escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> - (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) - +

数据的引用 + datadoi)) : + 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->datadoi; + //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.']'; + ?> (下载引用：RIS格式 | Bibtex格式 ) + citation; + endif; ?>

- datadoi) && !strpos($md->citation,$md->datadoi)) : ?> -

数据的引用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.']'; - ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

- ref) : ?> + ref) : ?>

相关文献（作者推荐）

    @@ -311,8 +293,8 @@ foreach($this->keys as $cg) : echo '
  1. '.$cg['keyword'].'
    2. '; endforeach; ?> - doi) : ?> -
    • 数据DOI：doi; ?>
    + datadoi) : ?> +
    @@ -387,11 +369,9 @@ endforeach; 可视化查看 - + -->
@@ -517,7 +497,7 @@ function ajaxpage(page){ ajaxpage_get(page,'uuid; ?>'); } - var config = { projection: "EPSG:4326"} +var config = { projection: "EPSG:4326"} var map=new TMap("watermap",config); var lat=south+$md->north)/2; ?>; var lng=east+$md->west)/2; ?>; @@ -552,11 +532,10 @@ function ajaxpage(page){ //创建缩放平移控件对象 control=new TNavigationControl(config); //添加缩放平移控件 - map.addControl(control); + map.addControl(control);

Cannot find the metadata.

没有找到对应的元数据。

- - + \ No newline at end of file