From e68958132c5a0f5a04258555efc790366d7976a3 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Thu, 13 Jun 2013 13:09:10 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96hiwater=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/controllers/HiwaterController.php | 95 ++++++++++++++-----
 1 file changed, 73 insertions(+), 22 deletions(-)

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()
 	{