From 93872affd9051db91662d4fd37abb6576ea7a413 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 15 Mar 2007 03:31:30 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@450
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/board/queries/getBoardList.xml | 13 ++++++++-----
 modules/module/schemas/modules.xml     |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/modules/board/queries/getBoardList.xml b/modules/board/queries/getBoardList.xml
index 17f3bc81a..a66289766 100644
--- a/modules/board/queries/getBoardList.xml
+++ b/modules/board/queries/getBoardList.xml
@@ -6,11 +6,14 @@
     <column name="*" />
   </columns>
   <conditions>
-    <condition operation="like" column="mid" var="s_mid" />
-    <condition operation="like" column="title" var="s_title" pipe="or" />
-    <condition operation="like" column="comment" var="s_comment" pipe="or" />
-    <condition operation="equal" column="module" var="s_module" pipe="or" />
-    <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+    <condition operation="equal" column="module" default="board" />
+    <group pipe="and">
+        <condition operation="like" column="mid" var="s_mid" pipe="or" />
+        <condition operation="like" column="title" var="s_title" pipe="or" />
+        <condition operation="like" column="comment" var="s_comment" pipe="or" />
+        <condition operation="equal" column="module" var="s_module" pipe="or" />
+        <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+    </group>
   </conditions>
   <navigation>
     <index var="sort_index" order="desc" />
diff --git a/modules/module/schemas/modules.xml b/modules/module/schemas/modules.xml
index d65347f26..f3ab488e6 100644
--- a/modules/module/schemas/modules.xml
+++ b/modules/module/schemas/modules.xml
@@ -1,12 +1,12 @@
 <table name="modules">
   <column name="module_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+  <column name="module" type="varchar" size="80" notnull="notnull" index="idx_module" />
   <column name="module_category_srl" type="number" size="11" notnull="notnull" default="0" index="idx_module_category" />
   <column name="layout_srl" type="number" size="11" notnull="notnull" default="0" />
   <column name="mid" type="varchar" size="40" notnull="notnull" unique="unique_mid"/>
   <column name="skin" type="varchar" size="250" notnull="notnull" />
   <column name="browser_title" type="varchar" size="250" notnull="notnull"/>
   <column name="description" type="text" size="250" />
-  <column name="module" type="varchar" size="80" notnull="notnull" />
   <column name="is_default" type="char" size="1" notnull="notnull" default="N" />
   <column name="menu_srl" type="number" size="11" default="0"/>
   <column name="extra_vars" type="text" />