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

merge heihedata branch from r3704 to r3714.

This commit is contained in:
wlx 2013-06-16 10:35:56 +00:00
parent 9790931463 e28595ff97
commit c12e8952b5
19 changed files with 384 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/admin/controllers/ReviewController.php
View File

@ -580,21 +580,27 @@ class Admin_ReviewController extends Zend_Controller_Action
function myreviewAction(){
include_once("data/Review.php");
include_once("data/Source.php");
include_once("helper/view.php");
$search=$this->_request->getParam('search');
$keyword = $this->_request->getParam('keyword');
$filter['keyword'] = $this->_request->getParam('keyword');
$filter['code'] = $this->_request->getParam('code');
$review = new Review($this->db);
if(!empty($search) && !empty($keyword))
if(!empty($search) && !empty($filter))
{
$rows = $review->adminReviews($keyword);
$this->view->keyword = $keyword;
$rows = $review->adminReviews($filter);
$this->view->keyword = $filter['keyword'];
$this->view->code = $filter['code'];
}else{
$rows = $review->adminReviews();
}
view::addPaginator($rows,$this->view,$this->_request);
$source = new Source($this->db);
$this->view->source = $source->Fetch();
view::addPaginator($rows,$this,NULL,15);
return true;
}//我管理的元数据

22
application/admin/views/scripts/review/myreview.phtml
View File

@ -26,12 +26,26 @@ table thead tr th {background:#EBF2F6;color:#444;}
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<form action="" method="get" class="search input-append">
<form method="get" id="search">
<input type="hidden" name="search" value='1' />
<input type="text" class="q" name="keyword" value="<?php echo $this->keyword; ?>" />
<button type="submit" class="btn">搜索</button>
<input type="hidden" name="code" id="code" value="<?php echo $this->code; ?>" />
<div class="input-append">
<input type="text" class="q" name="keyword" value="<?php echo $this->keyword; ?>" tabindex="1" />
<div class="btn-group">
<button tabindex="-1" class="btn" type="submit">搜索</button>
<button tabindex="-1" data-toggle="dropdown" class="btn dropdown-toggle">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="javascript:void(0);" onclick="$('#code').val('');$('#search').submit()">所有专题</a></li>
<?php if(!empty($this->source)) { ?>
<?php foreach($this->source as $v) { ?>
<li><a href="javascript:void(0);" onclick="$('#code').val('<?= $v['id'] ?>');$('#search').submit()"><?= $v['code'] ?></a></li>
<?php } }?>
</ul>
</div>
</div>
</form>
<table class="table table-bordered table-hover">
<thead>
<tr>

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

@ -2041,5 +2041,30 @@ class DataController extends Zend_Controller_Action
}
}
function listAction()
{
$sql="select m.uuid,m.title,m.citation,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year from normalmetadata m
left join mdstatus s on m.uuid=s.uuid
left join datadoi d on d.uuid=m.uuid
where s.status>4
and m.uuid not in
(select d.uuid from datasource d left join source s on d.sourceid=s.id
where s.code in ('heihe','water','hiwater','westee'))
order by m.title";
$this->view->metadata=$this->db->fetchAll($sql);
$sql="select m.uuid,m.title,m.citation,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>4 and m.title like '黑河综合遥感联合试验%' order by title";
$this->view->water=$this->db->fetchAll($sql);
$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid where s.status>0 and m.title like '黑河生态水文遥感试验%' order by title";
$this->view->hiwater=$this->db->fetchAll($sql);
$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='heihe' and s.status>0 and m.title not like '黑河生态水文遥感试验%' order by title";
$this->view->heihe=$this->db->fetchAll($sql);
$sql="select m.uuid,m.title,m.citation ,m.doi,d.doi as datadoi,d.ts_published,d.authors,d.publisher,date_part('year',d.ts_published) as publish_year
from normalmetadata m left join datadoi d on d.uuid=m.uuid left join mdstatus s on m.uuid=s.uuid left join datasource ds on ds.uuid=m.uuid left join source sr on ds.sourceid=sr.id where sr.code='westee' and s.status>4 order by title";
$this->view->westee=$this->db->fetchAll($sql);
}
}

93
application/default/controllers/HiwaterController.php
View File

@ -13,11 +13,11 @@ class HiwaterController extends DataController
{
$this->view->pageIn = "collapse1";
}
else if(in_array($acName,array("airborne","vegstructure","vegtype","vegparam","dem","dsm","temperature","soilmoisture")))
else if(in_array($acName,array("airborne","vegstructure","vegparam","temperature","soilmoisture")))
{
$this->view->pageIn = "collapse2";
}
else if(in_array($acName,array("hmon","autometeo","ec",'las','prec')))
else if(in_array($acName,array("hmon",'super','normal','prec')))
{
$this->view->pageIn = "collapse3";
}
@ -29,11 +29,14 @@ class HiwaterController extends DataController
{
$this->view->pageIn = "collapse5";
}
else if(in_array($acName,array("mso","cosmos","tdp","isotope")))
else if(in_array($acName,array("mso","autometeo","ec",'las',"cosmos","tdp","isotope")))
{
$this->view->pageIn = "collapse6";
}
else if(in_array($acName,array("rsproduct","dem","precipitation",'sm',"snow","vegtype","vegcov",'phenology','npp')))
{
$this->view->pageIn = "collapse7";
}
else if(in_array($acName,array("browse","thumb","fund","tag","timeline","timemap",'author','organization')))
{
$this->view->pageIn = "collapse10";
@ -141,21 +144,12 @@ class HiwaterController extends DataController
$this->getmd(array('','种植结构图'));
$this->_helper->viewRenderer('base');
}
function vegtypeAction()
{
$this->getmd(array('','植被类型图'));
$this->_helper->viewRenderer('base');
}
function vegparamAction()
{
$this->getmd(array('','植被结构参数'));
$this->_helper->viewRenderer('base');
}
function demAction()
{
$this->getmd(array('','数字高程模型'));
$this->_helper->viewRenderer('base');
}
function dsmAction()
{
$this->getmd(array('','数字表面模型'));
@ -166,17 +160,26 @@ class HiwaterController extends DataController
$this->getmd(array('','地表温度'));
$this->_helper->viewRenderer('base');
}
function soilmoistureAction()
{
$this->getmd(array('','地表土壤水文'));
$this->_helper->viewRenderer('base');
}
function hmonAction()
{
$this->getmd(array('自动气象站','涡动相关仪','大孔径闪烁仪','河川径流观测'));
$this->getmdlimited(array('西支','黄藏寺','黄草沟','峨堡','景阳岭','阿柔阳坡','阿柔阴坡','戈壁站','神沙窝沙漠站','花寨子荒漠站','张掖湿地站','阿柔超级站','大满超级站','四道桥超级站'),'水文气象');
$md=$this->view->metadata;
$this->getmd(array('','河川径流观测'));
$this->view->metadata=array_merge($md,$this->view->metadata);
$this->_helper->viewRenderer('base');
}
function superAction()
{
$this->getmdlimited(array('阿柔超级站','大满超级站','四道桥超级站'),'水文气象');
$this->_helper->viewRenderer('base');
}
function normalAction()
{
$this->getmdlimited(array('西支','黄藏寺','黄草沟','峨堡','景阳岭','阿柔阳坡','阿柔阴坡','戈壁站','神沙窝沙漠站','花寨子荒漠站','张掖湿地站'),'水文气象');
$this->_helper->viewRenderer('base');
}
function autometeoAction()
{
$this->getmd(array('','自动气象站'));
@ -278,7 +281,7 @@ class HiwaterController extends DataController
function msoAction()
{
$this->getmd(array('稳定同位素观测系统','热扩散液流计（TDP）','宇宙射线土壤水分'));
$this->getmd(array('自动气象站','涡动相关仪','大孔径闪烁仪','稳定同位素观测系统','热扩散液流计（TDP）','宇宙射线土壤水分'));
$this->_helper->viewRenderer('base');
}
@ -300,6 +303,54 @@ class HiwaterController extends DataController
$this->_helper->viewRenderer('base');
}
function rsproductAction()
{
$this->getmdlimited(array('DEM','DOM','降水','土壤水分','积雪','植被类型','植被覆盖度','物候期','NPP'),'数据产品');
$this->_helper->viewRenderer('base');
}
function demAction()
{
$this->getmdlimited(array('DEM','DOM'),'数据产品');
$this->_helper->viewRenderer('base');
}
function precipitationAction()
{
$this->getmdlimited(array('降水',''),'数据产品');
$this->_helper->viewRenderer('base');
}
function smAction()
{
$this->getmdlimited(array('土壤水分'),'数据产品');
$this->_helper->viewRenderer('base');
}
function snowAction()
{
$this->getmdlimited(array('积雪'),'数据产品');
$this->_helper->viewRenderer('base');
}
function vegtypeAction()
{
$this->getmdlimited(array('植被类型','种植结构'),'数据产品');
$this->_helper->viewRenderer('base');
}
function vegcovAction()
{
$this->getmdlimited(array('植被覆盖度',''),'数据产品');
$this->_helper->viewRenderer('base');
}
function phenologyAction()
{
$this->getmdlimited(array('物候期',''),'数据产品');
$this->_helper->viewRenderer('base');
}
function nppAction()
{
$this->getmdlimited(array('NPP',''),'数据产品');
$this->_helper->viewRenderer('base');
}
function listAction()
{
$sql="select uuid,title from normalmetadata where uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') order by timebegin,title";

85
application/default/views/scripts/data/list.phtml Normal file
View File

@ -0,0 +1,85 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle()->setSeparator(' - ');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
$this->breadcrumb('数据列表');
$this->breadcrumb()->setSeparator(' > ');
?>
<div class="row">
<table class="span12"><?php foreach($this->metadata as $md) : ?>
<tr><td><h4><?php echo $md['title']; ?></h4></td>
<td rowspan="2"><img src="/service/qrcode/uuid/<?php echo $md['uuid']; ?>"> </td></tr>
<tr><td><?php if ($md['citation']) : ?>
<?php if (empty($md['datadoi']) || !strpos($md['citation'],$md['datadoi'])) : ?>
<?php endif; echo $this->escape($md['citation']); ?>
<br />
<?php if (!empty($md['datadoi']) && !strpos($md['citation'],$md['datadoi'])) : ?>
<?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'];
?>
<?php endif; endif; ?> </td></tr>
<?php endforeach; ?></table>
<table class="span12"><?php foreach($this->water as $md) : ?>
<tr><td><h4><?php echo $md['title']; ?></h4></td>
<td rowspan="2"><img src="/service/qrcode/uuid/<?php echo $md['uuid']; ?>"> </td></tr>
<tr><td><?php if ($md['citation']) : ?>
<?php if (empty($md['datadoi']) || !strpos($md['citation'],$md['datadoi'])) : ?>
<?php endif; echo $this->escape($md['citation']); ?>
<br />
<?php if (!empty($md['datadoi']) && !strpos($md['citation'],$md['datadoi'])) : ?>
<?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'];
?>
<?php endif; endif; ?> </td></tr>
<?php endforeach; ?></table>
<table class="span12"><?php foreach($this->hiwater as $md) : ?>
<tr><td><h4><?php echo $md['title']; ?></h4></td>
<td rowspan="2"><img src="/service/qrcode/uuid/<?php echo $md['uuid']; ?>"> </td></tr>
<tr><td><?php if ($md['citation']) : ?>
<?php if (empty($md['datadoi']) || !strpos($md['citation'],$md['datadoi'])) : ?>
<?php endif; echo $this->escape($md['citation']); ?>
<br />
<?php if (!empty($md['datadoi']) && !strpos($md['citation'],$md['datadoi'])) : ?>
<?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'];
?>
<?php endif; endif; ?> </td></tr>
<?php endforeach; ?></table>
<table class="span12"><?php foreach($this->heihe as $md) : ?>
<tr><td><h4><?php echo $md['title']; ?></h4></td>
<td rowspan="2"><img src="/service/qrcode/uuid/<?php echo $md['uuid']; ?>"> </td></tr>
<tr><td><?php if ($md['citation']) : ?>
<?php if (empty($md['datadoi']) || !strpos($md['citation'],$md['datadoi'])) : ?>
<?php endif; echo $this->escape($md['citation']); ?>
<br />
<?php if (!empty($md['datadoi']) && !strpos($md['citation'],$md['datadoi'])) : ?>
<?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'];
?>
<?php endif; endif; ?> </td></tr>
<?php endforeach; ?></table>
<table class="span12"><?php foreach($this->westee as $md) : ?>
<tr><td><h4><?php echo $md['title']; ?></h4></td>
<td rowspan="2"><img src="/service/qrcode/uuid/<?php echo $md['uuid']; ?>"> </td></tr>
<tr><td><?php if ($md['citation']) : ?>
<?php if (empty($md['datadoi']) || !strpos($md['citation'],$md['datadoi'])) : ?>
<?php endif; echo $this->escape($md['citation']); ?>
<br />
<?php if (!empty($md['datadoi']) && !strpos($md['citation'],$md['datadoi'])) : ?>
<?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'];
?>
<?php endif; endif; ?> </td></tr>
<?php endforeach; ?></table>
</div>

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

@ -29,7 +29,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<div>
<?php if ($md->citation) : ?>
<hr />
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<p><?php if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>
(下载引用：<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>)
@ -38,7 +38,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<?php if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
<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.', '.$md->publish_year.'. 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 />

4
application/default/views/scripts/heihe/view.phtml
View File

@ -38,7 +38,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<div>
<?php if ($md->citation) : ?>
<hr />
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<p><?php if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>
(下载引用：<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>)
@ -47,7 +47,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<?php if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
<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.', '.$md->publish_year.'. 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 />

41
application/default/views/scripts/hiwater/navi.phtml
View File

@ -58,10 +58,9 @@
<div id="collapse3" class="accordion-body collapse">
<div class="accordion-inner">
<ul class="nav nav-list heihe-subnav">
<li id="Nav-hiwater-autometeo"><a href="/hiwater/autometeo"><i class="icon-double-angle-right"></i>自动气象站观测</a></li>
<li id="Nav-hiwater-ec"><a href="/hiwater/ec"><i class="icon-double-angle-right"></i>涡动相关观测</a></li>
<li id="Nav-hiwater-las"><a href="/hiwater/las"><i class="icon-double-angle-right"></i>大孔径闪烁仪观测</a></li>
<li id="Nav-hiwater-prec"><a href="/hiwater/prec"><i class="icon-double-angle-right"></i>径流与降水观测</a></li>
<li id="Nav-hiwater-super"><a href="/hiwater/super"><i class="icon-double-angle-right"></i>超级站</a></li>
<li id="Nav-hiwater-normal"><a href="/hiwater/normal"><i class="icon-double-angle-right"></i>普通站</a></li>
<li id="Nav-hiwater-prec"><a href="/hiwater/prec"><i class="icon-double-angle-right"></i>径流观测</a></li>
</ul>
</div>
</div>
@ -111,9 +110,9 @@
<div id="collapse6" class="accordion-body collapse">
<div class="accordion-inner">
<ul class="nav nav-list heihe-subnav">
<!--<li id="Nav-hiwater-autometeo"><a href="/hiwater/autometeo"><i class="icon-double-angle-right"></i>自动气象站</a></li>
<li id="Nav-hiwater-autometeo"><a href="/hiwater/autometeo"><i class="icon-double-angle-right"></i>自动气象站观测</a></li>
<li id="Nav-hiwater-ec"><a href="/hiwater/ec"><i class="icon-double-angle-right"></i>涡动相关观测</a></li>
<li id="Nav-hiwater-las"><a href="/hiwater/las"><i class="icon-double-angle-right"></i>大孔径闪烁仪观测</a></li>-->
<li id="Nav-hiwater-las"><a href="/hiwater/las"><i class="icon-double-angle-right"></i>大孔径闪烁仪观测</a></li>
<li id="Nav-hiwater-isotope"><a href="/hiwater/isotope"><i class="icon-double-angle-right"></i>稳定同位素观测</a></li>
<li id="Nav-hiwater-tdp"><a href="/hiwater/tdp"><i class="icon-double-angle-right"></i>树杆液流</a></li>
<li id="Nav-hiwater-cosmos"><a href="/hiwater/cosmos"><i class="icon-double-angle-right"></i>宇宙射线土壤水分观测COSMOS</a></li>
@ -150,25 +149,29 @@
下游绿洲生态耗水尺度转换遥感试验
</a>
</div>
</div>
</div> -->
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-water-cold">
<a class="accordion-toggle" href="/hiwater/satellite">
全流域生态水文关键参量遥感产品
<div class="accordion-heading" id="Nav-hiwater-rsproduct">
<a href="/hiwater/rsproduct" title="查看详细" class="pull-right detail-link"><i class="icon-arrow-right"></i></a>
<a class="accordion-toggle" data-toggle="collapse" data-parent="#side_accordion" href="#collapse7">
遥感产品
</a>
</div>
<div id="collapse6" class="accordion-body collapse">
<div id="collapse7" class="accordion-body collapse">
<div class="accordion-inner">
<ul class="nav nav-list heihe-subnav">
<li id="Nav-water-radiometer"><i class="icon-double-angle-right"></i><a href="/hiwater/radiometer">积雪面积</a></li>
<li id="Nav-water-lidar"><i class="icon-double-angle-right"></i><a href="/hiwater/lidar">土壤水分</a></li>
<li id="Nav-water-widas"><i class="icon-double-angle-right"></i><a href="/hiwater/widas">降水</a></li>
<li id="Nav-water-asd"><i class="icon-double-angle-right"></i><a href="/hiwater/asd">植被类型分布</a></li>
<li id="Nav-water-asd"><i class="icon-double-angle-right"></i><a href="/hiwater/asd">植被覆盖度</a></li>
<li id="Nav-water-asd"><i class="icon-double-angle-right"></i><a href="/hiwater/asd">物候期</a></li>
<li id="Nav-water-npp"><i class="icon-double-angle-right"></i><a href="/hiwater/npp">NPP</a></li>
<li id="Nav-hiwater-dem"><a href="/hiwater/dem"><i class="icon-double-angle-right"></i>DEM和DSM</a></li>
<li id="Nav-hiwater-precipitation"><a href="/hiwater/precipitation"><i class="icon-double-angle-right"></i>降水</a></li>
<li id="Nav-hiwater-sm"><a href="/hiwater/sm"><i class="icon-double-angle-right"></i>土壤水分</a></li>
<li id="Nav-hiwater-snow"><a href="/hiwater/snow"><i class="icon-double-angle-right"></i>积雪</a></li>
<li id="Nav-hiwater-vegtype"><a href="/hiwater/vegtype"><i class="icon-double-angle-right"></i>植被类型分布</a></li>
<li id="Nav-hiwater-vegcov"><a href="/hiwater/vegcov"><i class="icon-double-angle-right"></i>植被覆盖度</a></li>
<li id="Nav-hiwater-phenology"><a href="/hiwater/phenology"><i class="icon-double-angle-right"></i>物候期</a></li>
<li id="Nav-hiwater-npp"><a href="/hiwater/npp"><i class="icon-double-angle-right"></i>NPP</a></li>
</ul>
</div>
</div> -->
</div>
</div>
<div class="accordion-group heihe-accordion-title">
<div class="accordion-heading" id="Nav-hiwater-satellite">
<a class="accordion-toggle" href="/hiwater/satellite">

2
application/default/views/scripts/hiwater/view.phtml
View File

@ -36,7 +36,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<div>
<?php if ($md->citation) : ?>
<hr />
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<p><?php if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
<?php endif; echo $this->escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?>
(下载引用：<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>)

4
application/default/views/scripts/water/view.phtml
View File

@ -32,13 +32,13 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
<div>
<?php if ($md->citation) : ?>
<hr />
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/dataplatformhelp/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<h4><i class="icon-quote-left muted"></i>本数据引用方式<a class="btn btn-danger pull-right" href="/archives/help/platform/archive-23.html" ><i class="icon-comment"></i>数据引用帮助</a></h4>
<p><?php if (empty($md->datadoi) || !strpos($md->citation,$md->datadoi)) : ?><span class="label label-info">文章的引用</span>
<?php endif; echo $this->escape($md->citation);?></p>
<?php if (!empty($md->datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
<p><span class="label label-info">数据的引用</span><?php
echo substr($md->authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
echo ' ['.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 />

11
application/models/data/Review.php
View File

@ -64,7 +64,7 @@ class Review extends Zend_Controller_Plugin_Abstract
}
//后台我负责的评审
function adminReviews($keyword = "",$order="")
function adminReviews($filter = "",$order="")
{
include_once('helper/view.php');
$uid = view::User('id');
@ -74,9 +74,13 @@ class Review extends Zend_Controller_Plugin_Abstract
$wheresql[] = " m.status in (1,2,3,4) ";
$wheresql[] = " u.id=$uid ";
if(!empty($keyword))
if(isset($filter['keyword']) && !empty($filter['keyword']))
{
$wheresql[] = " md.title like '%$keyword%' ";
$wheresql[] = " md.title like '%".$filter['keyword']."%' ";
}
if(isset($filter['code']) && !empty($filter['code']))
{
$wheresql[] = " s.id=".$filter['code']." ";
}
if(count($wheresql)>0)
@ -91,6 +95,7 @@ class Review extends Zend_Controller_Plugin_Abstract
right join metadata md on md.uuid=m.uuid
left join geonetworkmetadata g on m.uuid=g.uuid
left join users u on u.id=m.userid
left join datasource s on s.uuid=md.uuid
$wheresql
order by m.status desc,m.ts_accepted desc";

21
application/models/data/Source.php Normal file
View File

@ -0,0 +1,21 @@
<?php
class Source
{
private $db; //传入PDO对象.
//使用到的公共变量
public $tbl_source = "source";
public $tbl_datasource = "datasource";
function __construct($db)
{
$this->db = $db;
}
function Fetch()
{
$sql = "SELECT * FROM ".$this->tbl_source."";
$rs = $this->db->query($sql);
return $rs->fetchAll();
}
}

BIN
data/images/westdc-128.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
data/images/westdc-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 617 B

BIN
data/images/westdc-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
data/images/westdc-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
data/images/westdc-64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
data/images/westdc-new-logo.xcf Normal file
View File

Binary file not shown.

109
data/images/westdc.svg Normal file
View File

@ -0,0 +1,109 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
id="svg2"
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="westdc.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.7"
inkscape:cx="214.35162"
inkscape:cy="547.75391"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1615"
inkscape:window-height="1026"
inkscape:window-x="1745"
inkscape:window-y="24"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<g
id="g3001"
inkscape:export-filename="/home/wlx/Desktop/westdc-16.png"
inkscape:export-xdpi="2.9241405"
inkscape:export-ydpi="2.9241405">
<path
inkscape:connector-curvature="0"
id="path4024"
d="m 371.94643,293.24554 c -49.32159,6.928 -93.26043,30.64502 -125.84375,65.1875 l 27.1875,0 c 9.65759,25.9974 19.28798,52.00985 28.96875,78 9.61729,-26.00029 19.22409,-52.01034 28.875,-78 l 45.6875,0 c -16.89472,44.74843 -33.49599,89.58809 -50.3125,134.40625 l -44.75,0 c -9.74958,-26.72114 -19.4112,-53.44567 -29.09375,-80.1875 -9.81363,26.73676 -19.6183,53.45249 -29.4375,80.1875 l -35.125,0 c -0.24114,4.16371 -0.375,8.36959 -0.375,12.59375 0,52.98276 19.26534,101.44115 51.125,138.84375 87.83634,-32.11471 151.75,-130.09301 151.75,-246 0,-37.42049 -6.67947,-72.95883 -18.65625,-105.03125 z M 188.10268,492.83929 c 1.24683,-21.52885 5.67062,-42.20131 12.8125,-61.5625 -9.03527,-24.27487 -18.04298,-48.56398 -27.0625,-72.84375 l -45.59375,0 0.9375,2.4375 c 16.37944,43.927 32.85151,88.0004 49.3125,131.96875 l 9.59375,0 z m 12.8125,-61.5625 c 0.63918,1.71728 1.26665,3.4391 1.90625,5.15625 5.00583,-13.50389 9.97729,-27.02283 14.96875,-40.53125 -6.65677,11.17225 -12.31373,23.00967 -16.875,35.375 z m 16.875,-35.375 c 8.06084,-13.52874 17.56948,-26.07979 28.3125,-37.46875 l -14.4375,0 c -4.62324,12.48939 -9.2592,24.97696 -13.875,37.46875 z"
style="fill:#008800;fill-opacity:1" />
<path
id="path3931"
d="m 401.1808,291.10995 c -2.59207,0 -5.17841,0.0642 -7.75,0.15625 96.65213,18.80821 174.79861,72.40429 209.59375,142.03125 C 573.41341,350.42577 494.2221,291.10995 401.1808,291.10995 z"
style="fill:#008800;fill-opacity:1"
inkscape:connector-curvature="0" />
<path
id="path3961"
d="m 405.83705,297.04745 c 95.52583,34.37232 163.90625,126.16775 163.90625,234.0625 0,58.98055 -20.43995,113.16052 -54.5625,155.78125 47.74403,-30.04671 82.78763,-78.42447 95.28125,-135.25 0.4546,-5.59919 0.71875,-11.24426 0.71875,-16.9375 0,-109.66026 -85.70805,-202.94865 -205.34375,-237.65625 z"
style="fill:#008800;fill-opacity:1"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3933"
d="m 375.83343,288.49539 c 42.79585,42.32564 70.96869,101.8308 74.57682,168.93931 5.82132,108.27233 -54.0538,203.74498 -142.43502,241.8779 23.70768,9.24697 49.35304,14.95952 76.13997,16.47943 C 447.11506,671.9024 487.34366,586.93915 482.21852,491.61536 477.4877,403.62582 435.26272,328.53704 375.83343,288.49539 z"
style="fill:#008800;fill-opacity:1" />
<path
id="path3923"
d="m 378.77455,292.2662 c -1.36055,0.14185 -2.71038,0.3015 -4.0625,0.46875 15.90915,35.95266 25.03125,77.89691 25.03125,122.6875 0,120.70568 -66.30061,220.69578 -152.90625,238.5625 11.31275,11.74956 23.96278,22.18868 37.6875,31.125 78.78796,-28.70813 136.65625,-123.86677 136.65625,-236.84375 0,-59.23764 -15.91816,-113.56771 -42.40625,-156 z"
style="fill:#008800;fill-opacity:1"
inkscape:connector-curvature="0" />
<path
id="path3950"
d="m 389.21205,291.4537 c -2.7617,0.15123 -5.518,0.33717 -8.25,0.59375 0.0354,0.0377 0.0584,0.0873 0.0937,0.125 75.15849,44.53235 125.8125,128.44662 125.8125,224.65625 0,82.06266 -36.86496,155.19432 -94.34375,202.5625 24.11513,-1.25739 47.17409,-6.5108 68.53125,-15.09375 42.73174,-46.27391 68.6875,-107.14941 68.6875,-173.875 0,-106.30677 -65.8681,-197.83317 -160.53125,-238.96875 z"
style="fill:#008800;fill-opacity:1"
inkscape:connector-curvature="0" />
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="层"
style="display:inline">
<flowRoot
xml:space="preserve"
id="flowRoot3094"
style="font-size:72px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
id="flowRegion3096"><rect
id="rect3098"
width="68.571411"
height="117.14286"
x="94.285713"
y="168.07646"
style="font-size:72px" /></flowRegion><flowPara
id="flowPara3100"
style="font-size:72px" /></flowRoot> </g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB