From 40782981e85d42c186d6c4be0b582bb8fa545e82 Mon Sep 17 00:00:00 2001
From: ovclas <ovclas@gmail.com>
Date: Tue, 25 Oct 2011 01:39:47 +0000
Subject: [PATCH] issue 594 init point bug fixed

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9719 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/queries/getCommentPoint.xml  | 33 ++++++++++++++--------
 modules/point/queries/getDocumentPoint.xml |  3 ++
 modules/point/queries/getFilePoint.xml     |  3 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/modules/point/queries/getCommentPoint.xml b/modules/point/queries/getCommentPoint.xml
index 2344aa1dc..e74f85e06 100644
--- a/modules/point/queries/getCommentPoint.xml
+++ b/modules/point/queries/getCommentPoint.xml
@@ -1,14 +1,23 @@
 <query id="getCommentPoint" action="select">
-    <tables>
-        <table name="comments" />
-    </tables>
-    <columns>
-        <column name="module_srl" />
-        <column name="member_srl" />
-        <column name="count(*)" alias="count" />
-    </columns>
-    <groups>
-        <group column="module_srl" />
-        <group column="member_srl" />
-    </groups>
+	<tables>
+		<table name="comments" />
+		<table name="documents" type="left outer join" >
+			<conditions>
+				<condition operation="equal" column="comments.document_srl" default="documents.document_srl" />
+			</conditions>
+		</table>
+	</tables>
+	<columns>
+		<column name="comments.module_srl" />
+		<column name="comments.member_srl" />
+		<column name="count(*)" alias="count" />
+	</columns>
+	<conditions>
+		<condition operation="notequal" column="comments.member_srl" default="0" />
+		<condition operation="notequal" column="comments.member_srl" default="documents.member_srl" pipe="and" />
+	</conditions>
+	<groups>
+		<group column="comments.module_srl" />
+		<group column="comments.member_srl" />
+	</groups>
 </query>
diff --git a/modules/point/queries/getDocumentPoint.xml b/modules/point/queries/getDocumentPoint.xml
index e60b8b84e..e0e5c5cd3 100644
--- a/modules/point/queries/getDocumentPoint.xml
+++ b/modules/point/queries/getDocumentPoint.xml
@@ -7,6 +7,9 @@
         <column name="member_srl" />
         <column name="count(*)" alias="count" />
     </columns>
+	<conditions>
+		<condition operation="notequal" column="member_srl" default="0" />
+	</conditions>
     <groups>
         <group column="module_srl" />
         <group column="member_srl" />
diff --git a/modules/point/queries/getFilePoint.xml b/modules/point/queries/getFilePoint.xml
index 3a7247233..3b057a3d8 100644
--- a/modules/point/queries/getFilePoint.xml
+++ b/modules/point/queries/getFilePoint.xml
@@ -8,7 +8,8 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="isvalid" default="Y" notnull="notnull" />
+		<condition operation="notequal" column="member_srl" default="0" />
+        <condition operation="equal" column="isvalid" default="Y" notnull="notnull" pipe="and" />
     </conditions>
     <groups>
         <group column="module_srl" />