From 270a9aeb8628a3f6d75310950cab59cb17b910f9 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Fri, 24 Feb 2012 09:00:27 +0000
Subject: [PATCH] issue 1518, Added blamed count to search option

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10189 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.model.php                       | 8 ++++++--
 modules/document/lang/lang.xml                            | 3 +++
 modules/document/queries/getDocumentCount.xml             | 1 +
 .../document/queries/getDocumentCountByGroupStatus.xml    | 1 +
 modules/document/queries/getDocumentList.xml              | 1 +
 modules/document/queries/getDocumentListExtraSort.xml     | 1 +
 modules/document/queries/getDocumentListUseIndex.xml      | 1 +
 modules/document/queries/getDocumentListWithinMember.xml  | 1 +
 modules/document/queries/getDocumentPage.xml              | 3 +++
 modules/document/queries/getTrashList.xml                 | 1 +
 10 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index bfbbe3f65..7adb67bbc 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -330,7 +330,6 @@
 				}
 				// Return if no result or an error occurs
 				if(!$output->toBool()||!count($output->data)) return $output;
-
 				$idx = 0;
 				$data = $output->data;
 				unset($output->data);
@@ -573,6 +572,7 @@
                         else $args->regdate = $oDocument->get('regdate');
                     break;
                 case 'voted_count' :
+                case 'blamed_count' :
                 case 'readed_count' :
                 case 'comment_count' :
                 case 'title' :
@@ -1012,6 +1012,7 @@
                     case 'member_srl' :
                     case 'readed_count' :
                     case 'voted_count' :
+                    case 'blamed_count' :
                     case 'comment_count' :
                     case 'trackback_count' :
                     case 'uploaded_count' :
@@ -1094,7 +1095,7 @@
 		{
 			$sortIndex = $obj->sort_index;
 			$isExtraVars = false;
-            if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+            if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','blamed_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
 			{
 				// get module_srl extra_vars list
 				if ($load_extra_vars)
@@ -1174,6 +1175,9 @@
                     case 'uploaded_count' :
                             $args->{"s_".$search_target} = (int)$search_keyword;
                         break;
+                    case 'blamed_count' :
+                            $args->{"s_".$search_target} = (int)$search_keyword * -1;
+						break;
                     case 'regdate' :
                     case 'last_update' :
                     case 'ipaddress' :
diff --git a/modules/document/lang/lang.xml b/modules/document/lang/lang.xml
index d26b4c469..dae12945f 100644
--- a/modules/document/lang/lang.xml
+++ b/modules/document/lang/lang.xml
@@ -489,6 +489,9 @@
 			<value xml:lang="tr"><![CDATA[Oylama Sayısı (over)]]></value>
 			<value xml:lang="vi"><![CDATA[Lượt bình chọn]]></value>
 		</item>
+		<item name="blamed_count">
+			<value xml:lang="ko"><![CDATA[비추천 수 (이상)]]></value>
+		</item>
 		<item name="comment_count ">
 			<value xml:lang="ko"><![CDATA[댓글 수 (이상)]]></value>
 			<value xml:lang="en"><![CDATA[Number of Comments (over)]]></value>
diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml
index 96995d139..ddc92d1ba 100644
--- a/modules/document/queries/getDocumentCount.xml
+++ b/modules/document/queries/getDocumentCount.xml
@@ -24,6 +24,7 @@
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml
index 06cbb77ff..d9150ca46 100644
--- a/modules/document/queries/getDocumentCountByGroupStatus.xml
+++ b/modules/document/queries/getDocumentCountByGroupStatus.xml
@@ -25,6 +25,7 @@
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml
index 768d2c33e..b74e7f364 100644
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@@ -28,6 +28,7 @@
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml
index eba5bc7b2..17bdd527f 100644
--- a/modules/document/queries/getDocumentListExtraSort.xml
+++ b/modules/document/queries/getDocumentListExtraSort.xml
@@ -32,6 +32,7 @@
             <condition operation="equal" column="d.member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="d.readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="d.voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="d.blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="d.comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="d.trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="d.uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml
index d7338d5b7..56f7ca1c9 100644
--- a/modules/document/queries/getDocumentListUseIndex.xml
+++ b/modules/document/queries/getDocumentListUseIndex.xml
@@ -28,6 +28,7 @@
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentListWithinMember.xml b/modules/document/queries/getDocumentListWithinMember.xml
index af2f1b610..9a073f9dc 100644
--- a/modules/document/queries/getDocumentListWithinMember.xml
+++ b/modules/document/queries/getDocumentListWithinMember.xml
@@ -22,6 +22,7 @@
             <condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="documents.blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="documents.comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="documents.trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="documents.uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentPage.xml b/modules/document/queries/getDocumentPage.xml
index b0ea92d08..b14651cc3 100644
--- a/modules/document/queries/getDocumentPage.xml
+++ b/modules/document/queries/getDocumentPage.xml
@@ -12,6 +12,8 @@
         <condition operation="less" column="comment_count" var="rev_comment_count" filter="number" pipe="and" />
         <condition operation="more" column="voted_count" var="voted_count" filter="number" pipe="and" />
         <condition operation="less" column="voted_count" var="rev_voted_count" filter="number" pipe="and" />
+        <condition operation="less" column="blamed_count" var="blamed_count" filter="number" pipe="and" />
+        <condition operation="more" column="blamed_count" var="rev_blamed_count" filter="number" pipe="and" />
         <condition operation="more" column="readed_count" var="readed_count" filter="number" pipe="and" />
         <condition operation="less" column="readed_count" var="rev_readed_count" filter="number" pipe="and" />
         <condition operation="less" column="list_order" var="list_order" filter="number" pipe="and" />
@@ -35,6 +37,7 @@
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
diff --git a/modules/document/queries/getTrashList.xml b/modules/document/queries/getTrashList.xml
index 61be9e5ad..a6be78d71 100644
--- a/modules/document/queries/getTrashList.xml
+++ b/modules/document/queries/getTrashList.xml
@@ -33,6 +33,7 @@
             <condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="less" column="documents.blamed_count" var="s_blamed_count" pipe="or" />
             <condition operation="more" column="documents.comment_count" var="s_comment_count" pipe="or" />
             <condition operation="more" column="documents.trackback_count" var="s_trackback_count" pipe="or" />
             <condition operation="more" column="documents.uploaded_count" var="s_uploaded_count" pipe="or" />