From 9e5247d1007f9d933003e909b9ce4127a2de68bc Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 18 Apr 2007 01:47:47 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1203
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/counter/queries/getCounterLog.xml       | 13 +++++++------
 modules/counter/queries/getCounterStatus.xml    | 10 +++++-----
 modules/counter/queries/insertCounterLog.xml    |  6 +++---
 modules/counter/queries/insertCounterStatus.xml |  6 ++----
 modules/counter/queries/updateCounterStatus.xml |  2 +-
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/modules/counter/queries/getCounterLog.xml b/modules/counter/queries/getCounterLog.xml
index 30d9a3575..cb563ca64 100644
--- a/modules/counter/queries/getCounterLog.xml
+++ b/modules/counter/queries/getCounterLog.xml
@@ -1,11 +1,12 @@
-<query id="getDeniedIPList" action="select">
+<query id="getCounterLog" action="select">
     <tables>
-        <table name="spamfilter_denied_ip" />
+        <table name="counter_log" />
     </tables>
     <columns>
-        <column name="*" />
+        <column name="count(*)" alias="count"/>
     </columns>
-    <navigation>
-        <index var="sort_index" default="regdate" order="desc" />
-    </navigation>
+    <conditions>
+        <condition operation="equal" column="regdate" var="regdate" default="curdate()" notnull="notnull" />
+        <condition operation="equal" column="ipaddress" var="ipaddress" default="ipaddress()" notnull="notnull" pipe="and" />
+    </conditions>
 </query>
diff --git a/modules/counter/queries/getCounterStatus.xml b/modules/counter/queries/getCounterStatus.xml
index 30d9a3575..288f98d34 100644
--- a/modules/counter/queries/getCounterStatus.xml
+++ b/modules/counter/queries/getCounterStatus.xml
@@ -1,11 +1,11 @@
-<query id="getDeniedIPList" action="select">
+<query id="getCounterStatus.xml" action="select">
     <tables>
-        <table name="spamfilter_denied_ip" />
+        <table name="counter_status" />
     </tables>
     <columns>
         <column name="*" />
     </columns>
-    <navigation>
-        <index var="sort_index" default="regdate" order="desc" />
-    </navigation>
+    <conditions>
+        <condition operation="equal" column="regdate" var="regdate" notnull="notnull" />
+    </conditions>
 </query>
diff --git a/modules/counter/queries/insertCounterLog.xml b/modules/counter/queries/insertCounterLog.xml
index 6fcdf5a7a..d2dba0b43 100644
--- a/modules/counter/queries/insertCounterLog.xml
+++ b/modules/counter/queries/insertCounterLog.xml
@@ -1,9 +1,9 @@
-<query id="insertDeniedIP" action="insert">
+<query id="insertCounterLog" action="insert">
     <tables>
-        <table name="spamfilter_denied_ip" />
+        <table name="counter_log" />
     </tables>
     <columns>
-        <column name="ipaddress" var="ipaddress" notnull="notnull" />
         <column name="regdate" var="regdate" default="curdate()" />
+        <column name="ipaddress" var="ipaddress" notnull="notnull" default="ipaddress()" />
     </columns>
 </query>
diff --git a/modules/counter/queries/insertCounterStatus.xml b/modules/counter/queries/insertCounterStatus.xml
index e6a684fe1..01d52c855 100644
--- a/modules/counter/queries/insertCounterStatus.xml
+++ b/modules/counter/queries/insertCounterStatus.xml
@@ -1,10 +1,8 @@
-<query id="insertLog" action="insert">
+<query id="insertCounterStatus" action="insert">
     <tables>
-        <table name="spamfilter_log" />
+        <table name="counter_status" />
     </tables>
     <columns>
-        <column name="spamfilter_log_srl" default="sequence()"/>
-        <column name="ipaddress" default="ipaddress()" />
         <column name="regdate" var="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/counter/queries/updateCounterStatus.xml b/modules/counter/queries/updateCounterStatus.xml
index 8f2af4bd8..31554239a 100644
--- a/modules/counter/queries/updateCounterStatus.xml
+++ b/modules/counter/queries/updateCounterStatus.xml
@@ -1,4 +1,4 @@
-<query id="updateDocument" action="update">
+<query id="updateCounterStatus" action="update">
     <tables>
         <table name="documents" />
     </tables>