From 2d32af90774eb204a063a3897c55f6172d9a10ac Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 26 Dec 2012 05:59:03 +0000
Subject: [PATCH] =?UTF-8?q?fix=20#442,=20=E4=BC=98=E5=8C=96=E5=85=A8?=
 =?UTF-8?q?=E6=96=87=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E6=96=B0=E5=BB=BAxunsearch?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/index/index.phtml  | 2 +-
 application/default/views/scripts/search/index.phtml | 3 ++-
 application/models/SearchForm.php                    | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index d0abee7e..fa741568 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -71,7 +71,7 @@
 	<li class="item">
 	<a href="/data/advancesearch">高级搜索</a>
 	</li>
-	<li class="item"><form  id="search" enctype="application/x-www-form-urlencoded" action="/data/search" method="post">
+	<li class="item"><form  id="search" enctype="application/x-www-form-urlencoded" action="/search" method="get">
 <input type="text" name="q" id="q" value="回车搜索标题和摘要" onfocus="myfocus(this);" onblur="myblur(this);">
 <input type="hidden" name="submit" value="submit">
 </form></li>
diff --git a/application/default/views/scripts/search/index.phtml b/application/default/views/scripts/search/index.phtml
index 33eb139c..8daf4e55 100644
--- a/application/default/views/scripts/search/index.phtml
+++ b/application/default/views/scripts/search/index.phtml
@@ -141,7 +141,8 @@ $search=$this->search;
 			</h2>
 			<p><?php echo $search->highlight(htmlspecialchars($doc->description)); ?></p>
 			<ul>
-				<li><span>metadata:</span> <?php echo $search->highlight(htmlspecialchars($doc->data)); ?></li>
+				<li><span>关键词:</span> <?php echo $search->highlight(htmlspecialchars($doc->keyword)); ?></li>
+				<li><span>元数据:</span> <?php echo $search->highlight(htmlspecialchars($doc->data)); ?></li>
 			</ul>
 		</div>
 		<?php endforeach; ?>
diff --git a/application/models/SearchForm.php b/application/models/SearchForm.php
index ad7f9464..465671e9 100755
--- a/application/models/SearchForm.php
+++ b/application/models/SearchForm.php
@@ -6,7 +6,8 @@ class SearchForm extends Zend_Form
     {
         parent::__construct($options);
         $this->setName('search');
-        $this->setAction('/data/search');
+        $this->setAction('/search');
+        $this->setMethod('get');
 
         $q = new Zend_Form_Element_Text('q');
         $q->setRequired(true)