From 2cc77d574c2ef6acf6bd5b84a76ed157209db12e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 19 Apr 2007 10:01:15 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1250
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/blog/blog.class.php                  |  2 --
 modules/blog/blog.view.php                   |  4 ++--
 modules/blog/skins/default/filter/search.xml | 15 ---------------
 modules/blog/skins/default/layout.html       |  4 +---
 modules/blog/skins/default/list.html         |  1 -
 modules/document/document.model.php          |  9 +++++++--
 6 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 modules/blog/skins/default/filter/search.xml

diff --git a/modules/blog/blog.class.php b/modules/blog/blog.class.php
index 2addd1815..6b713dca8 100644
--- a/modules/blog/blog.class.php
+++ b/modules/blog/blog.class.php
@@ -7,8 +7,6 @@
 
     class blog extends ModuleObject {
 
-        var $search_option = array('title','content','title_content','user_name','user_id','tag'); ///< 검색 옵션
-
         var $skin = "default"; ///< 스킨 이름
         var $list_count = 1; ///< 한 페이지에 나타날 글의 수
         var $page_count = 10; ///< 페이지의 수
diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php
index b08612a05..0d82f7464 100644
--- a/modules/blog/blog.view.php
+++ b/modules/blog/blog.view.php
@@ -154,8 +154,8 @@
             $args->page_count = $this->page_count; ///< 페이지 네비게이션에 나타날 페이지의 수
 
             // 검색 옵션
-            $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
-            $args->search_keyword = Context::get('search_keyword'); ///< 검색어
+            $args->search_keyword = trim(Context::get('search_keyword')); ///< 검색어
+            if($args->search_keyword) $args->search_target = "title_content"; ///< 검색 고정
             $args->category_srl = $this->category_srl;
 
             $args->sort_index = 'list_order'; ///< 소팅 값
diff --git a/modules/blog/skins/default/filter/search.xml b/modules/blog/skins/default/filter/search.xml
deleted file mode 100644
index c748c016d..000000000
--- a/modules/blog/skins/default/filter/search.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<filter name="search" module="blog">
-  <form>
-    <node target="search_target" required="true" />
-    <node target="search_keyword" minlegnth="2" maxlength="40" required="true" />
-  </form>
-  <parameter>
-    <param name="mid" target="mid" />
-    <param name="search_target" target="search_target" />
-    <param name="search_keyword" target="search_keyword" />
-  </parameter>
-  <response callback_func="completeSearch">
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/blog/skins/default/layout.html b/modules/blog/skins/default/layout.html
index 62a3cab71..9e0d97cec 100644
--- a/modules/blog/skins/default/layout.html
+++ b/modules/blog/skins/default/layout.html
@@ -81,10 +81,8 @@
     <!--@if($grant->list)-->
         <!-- 검색 -->
         <div class="layout_search">
-            <form action="./" method="get" onsubmit="return procFilter(this, search)">
+            <form action="./" method="get">
                 <input type="hidden" name="mid" value="{$mid}" />
-                <input type="hidden" name="category" value="{$category}" />
-                <input type="hidden" name="search_target" value="title_content" />
                 <input type="text" class="search_keyword" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
                 <input type="submit" class="search_button" value="{$lang->cmd_search}" />
             </form>
diff --git a/modules/blog/skins/default/list.html b/modules/blog/skins/default/list.html
index 110e1b77a..0ae35ee48 100644
--- a/modules/blog/skins/default/list.html
+++ b/modules/blog/skins/default/list.html
@@ -1,4 +1,3 @@
-<!--%import("filter/search.xml")-->
 <!--#include("header.html")-->
 
 <!-- 목록 -->
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 1168b16d0..bbe03c46a 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -143,8 +143,8 @@
             $query_id = 'document.getDocumentList';
 
             // 검색 옵션 정리
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
+            $search_target = $obj->search_target;
+            $search_keyword = $obj->search_keyword;
             if($search_target && $search_keyword) {
                 switch($search_target) {
                     case 'title' :
@@ -155,6 +155,11 @@
                             if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
                             $args->s_content = $search_keyword;
                         break;
+                    case 'title_content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title = $search_keyword;
+                            $args->s_content = $search_keyword;
+                        break;
                     case 'user_id' :
                             if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
                             $args->s_user_id = $search_keyword;