diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php index 1d0b83e7..1fe5ef7e 100644 --- a/application/admin/controllers/ReviewController.php +++ b/application/admin/controllers/ReviewController.php @@ -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(); } + + $source = new Source($this->db); + $this->view->source = $source->Fetch(); - view::addPaginator($rows,$this->view,$this->_request); + view::addPaginator($rows,$this,NULL,15); return true; }//我管理的元数据 diff --git a/application/admin/views/scripts/review/myreview.phtml b/application/admin/views/scripts/review/myreview.phtml index fec2fa9d..86d32cea 100644 --- a/application/admin/views/scripts/review/myreview.phtml +++ b/application/admin/views/scripts/review/myreview.phtml @@ -26,12 +26,26 @@ table thead tr th {background:#EBF2F6;color:#444;} -
- - - -
- + diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php index 775538f5..4a7a8d54 100755 --- a/application/default/controllers/DataController.php +++ b/application/default/controllers/DataController.php @@ -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); + + } } diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php index 75adb558..3743b753 100644 --- a/application/default/controllers/HiwaterController.php +++ b/application/default/controllers/HiwaterController.php @@ -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'); } @@ -298,7 +301,55 @@ class HiwaterController extends DataController { $this->getmd(array('','宇宙射线土壤水分')); $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() { diff --git a/application/default/views/scripts/data/list.phtml b/application/default/views/scripts/data/list.phtml new file mode 100644 index 00000000..4649c695 --- /dev/null +++ b/application/default/views/scripts/data/list.phtml @@ -0,0 +1,85 @@ +headTitle($this->config->title->site); +$this->headTitle($this->config->title->data); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb(''.$this->config->title->data.''); +$this->breadcrumb('数据列表'); +$this->breadcrumb()->setSeparator(' > '); +?> +
+
metadata as $md) : ?> + + + +

+ + escape($md['citation']); ?> +
+ + + +
+ + + water as $md) : ?> + + + +

+ + escape($md['citation']); ?> +
+ + + +
+ + hiwater as $md) : ?> + + + +

+ + escape($md['citation']); ?> +
+ + + +
+ + heihe as $md) : ?> + + + +

+ + escape($md['citation']); ?> +
+ + + +
+ westee as $md) : ?> + + + +

+ + escape($md['citation']); ?> +
+ + + +
+ \ No newline at end of file diff --git a/application/default/views/scripts/data/view.phtml b/application/default/views/scripts/data/view.phtml index e3ec01e3..f02408ff 100755 --- a/application/default/views/scripts/data/view.phtml +++ b/application/default/views/scripts/data/view.phtml @@ -29,7 +29,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>
citation) : ?>
-

本数据引用方式数据引用帮助

+

本数据引用方式数据引用帮助

datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) @@ -38,7 +38,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?> 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.', '.$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.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

ref) : ?>
diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml index ddbe3908..90f44665 100755 --- a/application/default/views/scripts/heihe/view.phtml +++ b/application/default/views/scripts/heihe/view.phtml @@ -38,7 +38,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?>
citation) : ?>
-

本数据引用方式数据引用帮助

+

本数据引用方式数据引用帮助

datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用 escape($md->citation);if (strpos($md->citation,$md->datadoi)) : ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式) @@ -47,7 +47,7 @@ if ($md->title_en) echo '
'.$this->escape($md->title_en);?> 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.', '.$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.']'; ?> (下载引用：RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式)

ref) : ?>
diff --git a/application/default/views/scripts/hiwater/navi.phtml b/application/default/views/scripts/hiwater/navi.phtml index dfdd21c8..66006b2e 100644 --- a/application/default/views/scripts/hiwater/navi.phtml +++ b/application/default/views/scripts/hiwater/navi.phtml @@ -57,11 +57,10 @@
-
@@ -111,9 +110,9 @@
-
+
-->
-