From a754bfd2f774b9a077684e568648d9803a796271 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 22 Dec 2009 08:08:19 +0000
Subject: [PATCH] =?UTF-8?q?=E6=8A=8A=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E6=94=BE=E5=88=B0=E9=A1=B6=E9=83=A8=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=9D=A1=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/DataController.php         | 4 ++--
 application/default/views/scripts/data/advancesearch.phtml | 2 --
 application/default/views/scripts/data/search.phtml        | 1 -
 application/default/views/scripts/data/tools.phtml         | 3 ++-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index 9f10bf07..2cb4d367 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -446,8 +446,8 @@ class DataController extends Zend_Controller_Action
     function advancesearchAction()
     {
 		$this->view->addHelperPath('helper','Zend_View_Helper_');
-    	$form=new SearchForm();
-    	$this->view->form=$form;
+    	//$form=new SearchForm();
+    	//$this->view->form=$form;
 
     	$md=new MetadataTable();
     	$db=$md->getAdapter();
diff --git a/application/default/views/scripts/data/advancesearch.phtml b/application/default/views/scripts/data/advancesearch.phtml
index 75e26594..3ec374a9 100644
--- a/application/default/views/scripts/data/advancesearch.phtml
+++ b/application/default/views/scripts/data/advancesearch.phtml
@@ -15,8 +15,6 @@ $this->breadcrumb()->setSeparator(' > ');
 <div id='tools'>
 <?= $this->partial('data/tools.phtml'); ?>
 </div>
-<?php echo $this->form; ?>
-<a href="/data/advancesearch">高级搜索</a>
 <?php if (!empty($this->metadata)) : ?>
 <?php echo $this->page->getNavigation(); 
 foreach($this->metadata as $md) : ?>
diff --git a/application/default/views/scripts/data/search.phtml b/application/default/views/scripts/data/search.phtml
index af8ee3ae..ca1e9266 100755
--- a/application/default/views/scripts/data/search.phtml
+++ b/application/default/views/scripts/data/search.phtml
@@ -15,7 +15,6 @@ $this->breadcrumb()->setSeparator(' > ');
 <?= $this->partial('data/tools.phtml'); ?>
 </div>
 <?php echo $this->form; ?>
-<a href="/data/advancesearch">高级搜索</a>
 <?php if (!empty($this->metadata)) : ?>
 <?php echo $this->page->getNavigation(); 
 foreach($this->metadata as $md) : ?>
diff --git a/application/default/views/scripts/data/tools.phtml b/application/default/views/scripts/data/tools.phtml
index 3a0bfa59..fb7dd85d 100755
--- a/application/default/views/scripts/data/tools.phtml
+++ b/application/default/views/scripts/data/tools.phtml
@@ -6,5 +6,6 @@
 <li><a href="/data/map">空间浏览</a></li>
 <li><a href="/data/timemap">时空浏览</a></li>
 <li><a href="/data/browse">浏览所有元数据</a></li>
-<li><a href="/data/search">搜索元数据</a></li>
+<li><a href="/data/search">快速搜索</a></li>
+<li><a href="/data/advancesearch">高级搜索</a></li>
 </ul>
\ No newline at end of file