fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 17:22:20 +09:00
Code Issues Projects Releases Packages Wiki Activity

Use 'search' operation to improve search accuracy

Browse source
This commit is contained in:
Kijin Sung 2020-10-01 16:51:21 +09:00
parent 03c4d87cb9
commit 4102c4bda2
9 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/comment/comment.model.php
View file

@ -804,7 +804,7 @@ class commentModel extends comment
case 'content' : case 'content' :
if($search_keyword) if($search_keyword)
{ {
$search_keyword = str_replace(' ', '%', $search_keyword); $search_keyword = trim(utf8_normalize_spaces($search_keyword));
} }
$args->s_content = $search_keyword; $args->s_content = $search_keyword;
@ -960,7 +960,7 @@ class commentModel extends comment
case 'content' : case 'content' :
if($search_keyword) if($search_keyword)
{ {
$search_keyword = str_replace(' ', '%', $search_keyword); $search_keyword = trim(utf8_normalize_spaces($search_keyword));
} }
$args->s_content = $search_keyword; $args->s_content = $search_keyword;

2
modules/comment/queries/getTotalCommentCountByGroupStatus.xml
View file

@ -11,7 +11,7 @@
<condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" /> <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
<condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" /> <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="content" var="s_content" pipe="or" /> <condition operation="search" column="content" var="s_content" pipe="or" />
<condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="email_address" var="s_email_address" pipe="or" /> <condition operation="like" column="email_address" var="s_email_address" pipe="or" />

2
modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
View file

@ -12,7 +12,7 @@
<condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" /> <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" /> <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="comments.content" var="s_content" /> <condition operation="search" column="comments.content" var="s_content" />
<condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" /> <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />

2
modules/comment/queries/getTotalCommentList.xml
View file

@ -22,7 +22,7 @@
<condition operation="in" column="comments.status" var="statusList" pipe="and" /> <condition operation="in" column="comments.status" var="statusList" pipe="and" />
<condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" /> <condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="comments.content" var="s_content" pipe="or" /> <condition operation="search" column="comments.content" var="s_content" pipe="or" />
<condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" /> <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />

2
modules/comment/queries/getTotalCommentListWithinMember.xml
View file

@ -16,7 +16,7 @@
<condition operation="in" column="comments.status" var="statusList" pipe="and" /> <condition operation="in" column="comments.status" var="statusList" pipe="and" />
<condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" /> <condition operation="in" column="comments.member_srl" var="s_member_srl" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="comments.content" var="s_content" /> <condition operation="search" column="comments.content" var="s_content" />
<condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="comments.user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="comments.nick_name" var="s_nick_name" pipe="or" />
<condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" /> <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />

2
modules/document/document.model.php
View file

@ -1317,7 +1317,7 @@ class documentModel extends document
case 'tag' : case 'tag' :
case 'title_content' : case 'title_content' :
$use_division = true; $use_division = true;
$search_keyword = str_replace(' ', '%', $search_keyword); $search_keyword = trim(utf8_normalize_spaces($search_keyword));
if($search_target == 'title_content') if($search_target == 'title_content')
{ {
$args->s_title = $search_keyword; $args->s_title = $search_keyword;

4
modules/document/queries/getDocumentCount.xml
View file

@ -13,8 +13,8 @@
<condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" /> <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
<condition operation="in" column="status" var="statusList" pipe="and" /> <condition operation="in" column="status" var="statusList" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="title" var="s_title" /> <condition operation="search" column="title" var="s_title" />
<condition operation="like" column="content" var="s_content" pipe="and" /> <condition operation="search" column="content" var="s_content" pipe="and" />
<condition operation="equal" column="user_name" var="s_user_name" pipe="and" /> <condition operation="equal" column="user_name" var="s_user_name" pipe="and" />
<condition operation="equal" column="user_id" var="s_user_id" pipe="or" /> <condition operation="equal" column="user_id" var="s_user_id" pipe="or" />
<condition operation="equal" column="nick_name" var="s_nick_name" pipe="or" /> <condition operation="equal" column="nick_name" var="s_nick_name" pipe="or" />

4
modules/document/queries/getDocumentList.xml
View file

@ -17,8 +17,8 @@
<condition operation="below" column="list_order" var="last_division" pipe="and" /> <condition operation="below" column="list_order" var="last_division" pipe="and" />
</group> </group>
<group pipe="and"> <group pipe="and">
<condition operation="like" column="title" var="s_title" /> <condition operation="search" column="title" var="s_title" />
<condition operation="like" column="content" var="s_content" pipe="or" /> <condition operation="search" column="content" var="s_content" pipe="or" />
<condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="user_id" var="s_user_id" pipe="or" /> <condition operation="like_prefix" column="user_id" var="s_user_id" pipe="or" />
<condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="nick_name" var="s_nick_name" pipe="or" />

4
modules/document/queries/getDocumentListWithExtraVars.xml
View file

@ -25,8 +25,8 @@
<condition operation="more" column="documents.last_update" var="start_date" pipe="and" /> <condition operation="more" column="documents.last_update" var="start_date" pipe="and" />
<condition operation="less" column="documents.last_update" var="end_date" pipe="and" /> <condition operation="less" column="documents.last_update" var="end_date" pipe="and" />
<group pipe="and"> <group pipe="and">
<condition operation="like" column="documents.title" var="s_title" /> <condition operation="search" column="documents.title" var="s_title" />
<condition operation="like" column="documents.content" var="s_content" pipe="or" /> <condition operation="search" column="documents.content" var="s_content" pipe="or" />
<condition operation="like_prefix" column="documents.user_name" var="s_user_name" pipe="or" /> <condition operation="like_prefix" column="documents.user_name" var="s_user_name" pipe="or" />
<condition operation="like_prefix" column="documents.user_id" var="s_user_id" pipe="or" /> <condition operation="like_prefix" column="documents.user_id" var="s_user_id" pipe="or" />
<condition operation="like_prefix" column="documents.nick_name" var="s_nick_name" pipe="or" /> <condition operation="like_prefix" column="documents.nick_name" var="s_nick_name" pipe="or" />