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

merge sanjiangyuan-sub r5216, r5217 into sjy-water

This commit is contained in:
wlx 2015-01-31 08:36:35 +00:00
parent 9a1d8075c4
commit f2962b1f40
3 changed files with 24 additions and 46 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 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'; $this->view->pageID='doi-unready';
} else if ($ac=='prepare') { } else if ($ac=='prepare') {
//列出有DOI但还未进行提交申请的数据 //列出有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'; $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 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'; $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 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'; $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 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'; $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

@ -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-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-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-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> <li id="Nav-doi-unready"><a href="/data/doi/ac/unready">无DOI的数据</a></li>
</ul> </ul>
</div> </div>

55
application/default/views/scripts/data/view.phtml
View File

@ -34,39 +34,21 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
</p> </p>
</div> </div>
<div> <div>
<?php if ($this->mcitation) : ?> <?php if ($md->citation || $md->datadoi) : ?>
<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 /> <hr />
<h4><i class="icon-quote-left muted"></i>本数据引用方式</h4> <h4><i class="icon-quote-left muted"></i>本数据引用方式</h4>
<p><?php if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span> <p><span class="label label-info">数据的引用</span>
<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> <?php
(下载引用：<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>) if (!empty($md->datadoi)) :
<?php endif; ?> 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.']';
?> (下载引用：<a href="/service/ris/lang/cn/uuid/<?php echo $md->uuid; ?>">RIS格式</a> | <a href="/service/bibtex/lang/cn/uuid/<?php echo $md->uuid; ?>">Bibtex格式</a> )
<?php
else :
echo $md->citation;
endif; ?>
</p> </p>
<?php if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?> <?php endif; if ($this->ref) : ?>
<p><span class="label label-info">数据的引用</span><?php
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) : ?>
<hr /> <hr />
<h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4> <h4><i class="icon-eye-open text-success"></i>相关文献（作者推荐）</h4>
<ol> <ol>
@ -311,8 +293,8 @@ foreach($this->keys as $cg) :
echo '<li><a href="/data/tag/key/'.urlencode($cg['keyword']).'"><i class="icon-tag"></i>'.$cg['keyword'].'</a></li>'; echo '<li><a href="/data/tag/key/'.urlencode($cg['keyword']).'"><i class="icon-tag"></i>'.$cg['keyword'].'</a></li>';
endforeach; endforeach;
?></ul> ?></ul>
<?php if ($md->doi) : ?> <?php if ($md->datadoi) : ?>
<ul class="well well-small inline unstyled"><li><span class="label label-success">数据DOI：</span><?php echo $md->doi; ?></li></ul> <ul class="well well-small inline unstyled"><li><span class="label label-success">数据DOI：</span><a href="http://dx.doi.org/<?php echo $md->datadoi; ?>"><?php echo $md->datadoi; ?></a></li></ul>
<?php endif; ?> <?php endif; ?>
<div> <div>
<hr /> <hr />
@ -387,11 +369,9 @@ endforeach;
可视化查看 可视化查看
</a> </a>
<?php } ?> <?php } ?>
<!-- <!-- <a href="javascript:void(0);" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
<a href="javascript:void(0);" class="btn btn-block" title="喜欢此数据可以将它放到收藏夹中下次浏览">
收藏此数据 收藏此数据
</a> </a> -->
-->
</div> </div>
</div> </div>
<hr /> <hr />
@ -517,7 +497,7 @@ function ajaxpage(page){
ajaxpage_get(page,'<?= $md->uuid; ?>'); ajaxpage_get(page,'<?= $md->uuid; ?>');
} }
var config = { projection: "EPSG:4326"} var config = { projection: "EPSG:4326"}
var map=new TMap("watermap",config); var map=new TMap("watermap",config);
var lat=<?= ($md->south+$md->north)/2; ?>; var lat=<?= ($md->south+$md->north)/2; ?>;
var lng=<?= ($md->east+$md->west)/2; ?>; var lng=<?= ($md->east+$md->west)/2; ?>;
@ -559,4 +539,3 @@ function ajaxpage(page){
<p>没有找到对应的元数据。</p> <p>没有找到对应的元数据。</p>
<?php endif;?> <?php endif;?>
<script type="text/javascript" src="http://v3.jiathis.com/code_mini/jia.js?uid=1336100079460458" charset="utf-8"></script> <script type="text/javascript" src="http://v3.jiathis.com/code_mini/jia.js?uid=1336100079460458" charset="utf-8"></script>